From 33d8416c5a16fee7464df9774678bc60e47ff956 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 19 三月 2024 09:53:25 +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 | 17 +++++++++++++++-- 1 files changed, 15 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 c880d23..38b03e2 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 @@ -49,6 +49,7 @@ import com.vci.ubcs.starter.web.util.LangBaseUtil; import com.vci.ubcs.starter.web.util.VciBaseUtil; import com.vci.ubcs.system.cache.NacosConfigCache; +import com.vci.ubcs.system.dto.ClassifyAuthDTO; import com.vci.ubcs.system.feign.ISysClient; import org.apache.poi.hssf.util.HSSFColor; import org.slf4j.Logger; @@ -159,6 +160,7 @@ * @param */ @Override + @Transactional(rollbackFor = Exception.class) public R addSave(CodeClassify codeClassifyEntity) { try { VciBaseUtil.alertNotNull(codeClassifyEntity.getId(),"涓婚搴撶紪鍙蜂笉鑳戒负绌猴紒",codeClassifyEntity.getName(),"涓婚搴撳悕绉颁笉鑳戒负绌猴紒"); @@ -185,8 +187,19 @@ } DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyEntity, MdmBtmTypeConstant.CODE_CLASSIFY); codeClassifyEntity.setLcStatus(FRAMEWORK_DATA_ENABLED); - int insertNumber = codeClassifyMapper.insert(codeClassifyEntity); - return R.status(SqlHelper.retBool(insertNumber)); + boolean resBoolean = SqlHelper.retBool(codeClassifyMapper.insert(codeClassifyEntity)); + if (!resBoolean) { + return R.status(resBoolean); + } + // 鍒嗙被娣诲姞鎴愬姛锛岀粰绯荤粺绠$悊鍛樺拰褰撳墠瑙掕壊澧炲姞鍒嗙被鏉冮檺鍜屾暟鎹潈闄� + ClassifyAuthDTO classifyAuthDTO = new ClassifyAuthDTO(); + classifyAuthDTO.setClassifyId(codeClassifyEntity.getOid()); +// classifyAuthDTO.setClassId(codeClassifyEntity.getId()); + R r = sysClient.saveAddClassifyDefaultAuth(classifyAuthDTO); + if (!r.isSuccess()) { + throw new ServiceException("缁欒鑹叉巿浜堥粯璁ゆ潈闄愭椂鍑虹幇閿欒锛屽師鍥狅細"+r.getMsg()); + } + return R.status(resBoolean); } /** -- Gitblit v1.9.3