From bdec8b24b78a6f52d21fff2cc8dfab847304dacc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 四月 2025 11:46:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
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 <> #{dataId}
+ SELECT COUNT(1) FROM ${tableName} WHERE ${fieldName} = #{fieldVal} and id <> #{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>
<!-- 鏌ヨ閮ㄩ棬淇℃伅 浣滀负瀛楀吀鏁版嵁 -->
--
Gitblit v1.9.3