From f099be6e30adfdea4580b09e33d75dc146a7a475 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期三, 06 十二月 2023 09:05:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java index 095a9db..32c2f3b 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java @@ -179,7 +179,7 @@ codeClassifyEntity.setBtmTypeId(codeClassify.getBtmTypeId()); codeClassifyEntity.setBtmTypeName(codeClassify.getBtmTypeName()); } - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyEntity, MdmBtmTypeConstant.CODE_CLASSIFY,null); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyEntity, MdmBtmTypeConstant.CODE_CLASSIFY); codeClassifyEntity.setLcStatus(FRAMEWORK_DATA_ENABLED); int insertNumber = codeClassifyMapper.insert(codeClassifyEntity); return R.status(SqlHelper.retBool(insertNumber)); @@ -716,7 +716,7 @@ CodeSerialValue codeSerialValue = codeSerialValueMapper.selectOne(wrapper); if(codeSerialValue == null){ CodeSerialValue newSerialValue = new CodeSerialValue(); - DefaultAttrAssimtUtil.addDefaultAttrAssimt(newSerialValue,"codeserialvalue",null); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(newSerialValue,"codeserialvalue"); newSerialValue.setCodeRuleOid(codeAllCodeVO.getCodeRuleOid()); newSerialValue.setCodeSecOid(codeBasicSec.getOid()); newSerialValue.setSerialUnit(codeAllCodeVO.getSerialUnit()); -- Gitblit v1.9.3