From 5b160e382a766ae362f53c14b3bba6ce1704061d Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 31 七月 2023 15:59:51 +0800
Subject: [PATCH] 1、设置了默认值问题。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 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 24fc9ea..0de9edd 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
@@ -45,6 +45,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.context.annotation.Lazy;
@@ -457,16 +458,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("淇敼鎴愬姛");
}
@@ -844,6 +853,7 @@
if(pageHelper.getLimit() != -1){
query.setSize(pageHelper.getLimit());
query.setCurrent(pageHelper.getPage());
+ query.setDescs("versionValue");
}
// List<CodeClstemplateVO> doList = codeClstemplateMapper.selectPlCodeClstemplatePage(Condition.getPage(query), codeClstemplateVO);
@@ -1088,7 +1098,7 @@
//閫掑綊鎵句笂绾х殑妯℃澘
CodeClassify classifyDO = codeClassifyMapper.selectById(codeClassifyOid);
// codeClassifyDaoI.selectByPrimaryKey(codeClassifyOid);
- if(classifyDO==null&&StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
+ if(Func.isEmpty(classifyDO)&&StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
//璇存槑宸茬粡鏄《浜嗭紝涔熸病鎵惧埌鐨勮瘽锛岄偅灏辫繑鍥炰簡
return null;
}
--
Gitblit v1.9.3