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/ICodeRuleService.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/ICodeRuleService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
index 9cd21d5..e65a4a4 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
@@ -24,7 +24,6 @@
 import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
@@ -50,10 +49,10 @@
 
 	/**
 	 * 妫�鏌d缂栧彿鏄惁閲嶅
-	 * @param id 褰撳墠缂栧彿
+	 * @param codeRuleDTO 褰撳墠鍒ゆ柇鏄惁閲嶅鐨勫璞�
 	 * @return 杩斿洖false琛ㄧず鏈噸澶�
 	 */
-	boolean checkCodeRuleRepeat(String id);
+	boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO);
 
 	/**
 	 * 鏍¢獙缂栫爜瑙勫垯鐨勭姸鎬佹槸鍚﹀彲浠ョ紪杈戞垨鍒犻櫎
@@ -160,4 +159,13 @@
 	 * @return 瑙勫垯鐨勬樉绀哄璞�
 	 */
 	CodeRuleVO getObjectHasSecByOid(String codeRuleOid) throws VciBaseException;
+
+	/**
+	 * 妫�鏌ョ浉浼肩紪鐮佽鍒欙紝骞惰繑鍥炲搴旂殑缁撴灉
+	 * @param oid 涓婚敭
+	 * @return 鎵ц缁撴灉
+	 */
+	R checkLikeCodeRule(String oid) throws VciBaseException;
+
+
 }

--
Gitblit v1.9.3