From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件,使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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..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("淇敼鎴愬姛");
 	}
 

--
Gitblit v1.9.3