From cff3eeb04b238135f64f97e60b5a6f5639963281 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 20 三月 2025 10:41:03 +0800
Subject: [PATCH] art: 系统管理-字段重复值校验修改

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java              |    6 ++++++
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml             |   10 ++++++++--
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java |    5 +++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
index 04960c8..9efae64 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.controller;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang.StringUtils;
@@ -31,8 +32,8 @@
 @Api(tags="閲嶅鏍￠獙")
 public class DuplicateCheckController {
 
-	@Autowired
-	SysDictMapper sysDictMapper;
+	@Resource
+	private SysDictMapper sysDictMapper;
 
 	@Autowired
 	DictQueryBlackListHandler dictQueryBlackListHandler;
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
index 89bacbf..a3c6e1a 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
@@ -99,12 +99,18 @@
 
 	<!-- 閲嶅鏍￠獙 sql璇彞 -->
 	<select id="duplicateCheckCountSql" resultType="Long" parameterType="org.jeecg.modules.system.model.DuplicateCheckVo">
-		SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal} and id &lt;&gt; #{dataId}
+		SELECT COUNT(1) FROM ${tableName} WHERE ${fieldName} = #{fieldVal} and id &lt;&gt; #{dataId}
+		<if test="delFlag != null and delFlag ">
+			and del_flag=0
+		</if>
 	</select>
 
 	<!-- 閲嶅鏍￠獙 sql璇彞 -->
 	<select id="duplicateCheckCountSqlNoDataId" resultType="Long" parameterType="org.jeecg.modules.system.model.DuplicateCheckVo">
-		SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal}
+		SELECT COUNT(1) FROM ${tableName} WHERE ${fieldName} = #{fieldVal}
+		<if test="delFlag != null and delFlag ">
+			and del_flag=0
+		</if>
 	</select>
 
 	<!-- 鏌ヨ閮ㄩ棬淇℃伅 浣滀负瀛楀吀鏁版嵁 -->
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java
index c00dd97..c8f53d3 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java
@@ -41,4 +41,10 @@
 	@ApiModelProperty(value="鏁版嵁ID",name="dataId",example="2000")
 	private String dataId;
 
+	/**
+	 * 鍒犻櫎鏍囪
+	 */
+	@ApiModelProperty(value="鍒犻櫎鏍囪",name="delFlag",example="0")
+	private Boolean delFlag;
+
 }
\ No newline at end of file

--
Gitblit v1.9.3