From 0479902b6cc9d23e561a3d6f6dad067dd8edd216 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 25 七月 2023 16:47:21 +0800
Subject: [PATCH] 主题库分类添加修改bug
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index 9b73f3e..d87566d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -457,16 +457,24 @@
CodeClassifyTemplate codeClassifyTemplateDO = baseMapper.selectById(oid);
//鍋滅敤鐨勬椂鍊欙紝楠岃瘉妯℃澘鏄惁涓哄凡鍙戝竷
if(CodeClassifyTemplateLC.DISABLED.getValue().equals(lcStatus)){
-// CodeClstemplateEntity codeClassifyTemplateDO = baseMapper.selectById(oid);
if(!CodeClassifyTemplateLC.RELEASED.getValue().equals(codeClassifyTemplateDO.getLcStatus())){
return R.fail("妯℃澘鏈惎鐢紝涓嶈兘鍋滅敤锛�");
}
}
+
+ if(lcStatus.equals(CodeClassifyTemplateLC.RELEASED.getValue())){
+ QueryWrapper<CodeClassify> classifyQueryWrapper = new QueryWrapper<>();
+ classifyQueryWrapper.eq("oid",codeClassifyTemplateDO.getCodeClassifyOid());
+ classifyQueryWrapper.eq("lcstatus","Enabled");
+ List<CodeClassify> codeClassifyList = codeClassifyService.selectByWrapper(classifyQueryWrapper);
+ if(codeClassifyList.size()==0){
+ return R.fail("鏌ヨ鍒版墍灞炲垎绫绘湭鍚敤锛岃鍏堣繘琛屽惎鐢紒锛侊紒");
+ }
+ }
+
//鍚敤銆佸仠鐢�
codeClassifyTemplateDO.setLcStatus(lcStatus);
int u = baseMapper.updateById(codeClassifyTemplateDO);
-// codeClassifyTemplateMapper.updateLcStatus(oid,lcStatus);
-
return u==0?R.fail("淇敼澶辫触锛�"):R.success("淇敼鎴愬姛");
}
@@ -894,6 +902,7 @@
//璁剧疆btmtypeid鍜宯ame
CodeClassify codeClassifyDO = codeClassifyDOList.get(0);
codeClassifyTemplateDO.setBtmTypeId(codeClassifyDO.getBtmTypeId());
+ codeClassifyTemplateDO.setNameOid(VciBaseUtil.getPk());
codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());
codeClassifyTemplateDO.setLcStatus(FRAMEWORK_RELEASE_EDITING);
codeClassifyTemplateDO.setTs(new Date());
@@ -1087,7 +1096,7 @@
//閫掑綊鎵句笂绾х殑妯℃澘
CodeClassify classifyDO = codeClassifyMapper.selectById(codeClassifyOid);
// codeClassifyDaoI.selectByPrimaryKey(codeClassifyOid);
- if(StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
+ if(classifyDO==null&&StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
//璇存槑宸茬粡鏄《浜嗭紝涔熸病鎵惧埌鐨勮瘽锛岄偅灏辫繑鍥炰簡
return null;
}
--
Gitblit v1.9.3