From 983bdb5b89932b38d08a11ad1eed6ea89d1597e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 29 一月 2024 10:07:31 +0800
Subject: [PATCH] 更新

---
 assess-system/src/main/resources/mapper/SysDictDataMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/assess-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/assess-system/src/main/resources/mapper/SysDictDataMapper.xml
similarity index 90%
rename from assess-system/src/main/resources/mapper/system/SysDictDataMapper.xml
rename to assess-system/src/main/resources/mapper/SysDictDataMapper.xml
index 4fa0e8a..3d6e404 100644
--- a/assess-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/assess-system/src/main/resources/mapper/SysDictDataMapper.xml
@@ -12,12 +12,12 @@
     </update>
 
     <select id="countDictDataByType" resultType="java.lang.Integer">
-        select count(1) from sys_dict_data where dict_type=#{dictType}
+        select count(1) from sys_dict_data where dict_type=#{dictType} and del_flag=0
     </select>
 
     <select id="getDictDataByType" resultType="com.gkhy.assess.system.domain.SysDictData">
         <include refid="selectDictDataVo"/>
-        where d.dict_type=#{dictType} and d.status=0
+        where d.dict_type=#{dictType} and d.status=0 and d.del_flag=0
         order by d.sort asc
     </select>
 
@@ -29,13 +29,14 @@
     <select id="dictDataList" resultType="com.gkhy.assess.system.domain.SysDictData">
         <include refid="selectDictDataVo"/>
         <where>
+            and del_flag=0
             <if test="dictType != null and dictType != ''">
                 AND dict_type = #{dictType}
             </if>
             <if test="label != null and label != ''">
                 AND label like concat('%', #{label}, '%')
             </if>
-            <if test="status != null and status != ''">
+            <if test="status != null">
                 AND status = #{status}
             </if>
         </where>

--
Gitblit v1.9.2