From 49fef33cebe18fc10430147dbbb867c67d97750b Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 05 十二月 2023 16:19:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java index b77a7fc..61eb4aa 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.vci.ubcs.code.constant.MdmBtmTypeConstant; + import com.vci.ubcs.code.dto.CodeButtonDTO; import com.vci.ubcs.code.dto.CodeFixedValueDTO; import com.vci.ubcs.code.entity.CodeButton; @@ -34,6 +34,7 @@ import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.revision.service.RevisionModelUtil; import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil; +import com.vci.ubcs.starter.util.MdmBtmTypeConstant; import com.vci.ubcs.starter.web.pagemodel.DataGrid; import com.vci.ubcs.starter.web.pagemodel.PageHelper; import com.vci.ubcs.starter.web.util.BeanUtil; @@ -117,7 +118,7 @@ //灏咲TO杞崲涓篋O CodeButton codeButtonDO = new CodeButton(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeButtonDTO,codeButtonDO); - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeButtonDO, MdmBtmTypeConstant.CODE_BUTTON); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeButtonDO, MdmBtmTypeConstant.CODE_BUTTON,null); boolean resInsertCodeButton = codeButtonMapper.insert(codeButtonDO) > 0; return resInsertCodeButton ? codeButtonDO2VO(codeButtonDO):null; } @@ -134,7 +135,7 @@ //灏咲TO杞崲涓篋O CodeButton codeButtonDO = selectByOid(codeButtonDTO.getOid()); revisionModelUtil.copyFromDTOIgnore(codeButtonDTO,codeButtonDO); - DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeButtonDO); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeButtonDO,null); boolean resUpdateCodeButton = codeButtonMapper.updateById(codeButtonDO) > 0; return resUpdateCodeButton ? codeButtonDO2VO(codeButtonDO):null; } -- Gitblit v1.9.3