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/SysDictTypeMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/assess-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/assess-system/src/main/resources/mapper/SysDictTypeMapper.xml
similarity index 79%
rename from assess-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
rename to assess-system/src/main/resources/mapper/SysDictTypeMapper.xml
index bd85203..2622601 100644
--- a/assess-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/assess-system/src/main/resources/mapper/SysDictTypeMapper.xml
@@ -9,10 +9,11 @@
<select id="dictTypeList" resultType="com.gkhy.assess.system.domain.SysDictType">
<include refid="selectDictTypeVo"/>
<where>
+ and d.del_flag=0
<if test="name != null and name != ''">
AND d.name like concat('%', #{name}, '%')
</if>
- <if test="status != null and status != ''">
+ <if test="status != null">
AND d.status = #{status}
</if>
<if test="dictType != null and dictType != ''">
@@ -28,12 +29,19 @@
<select id="checkDictTypeUnique" resultType="com.gkhy.assess.system.domain.SysDictType">
<include refid="selectDictTypeVo"/>
- where d.dict_type = #{dictType} limit 1
+ <where>
+ and (d.dict_type = #{dictType}
+ <if test="name!=null and name!=''">
+ or name=#{name}
+ </if>
+ )
+ and d.del_flag=0 limit 1
+ </where>
</select>
<select id="getDictTypeByType" resultType="com.gkhy.assess.system.domain.SysDictType">
<include refid="selectDictTypeVo"/>
- where d.dict_type = #{dictType}
+ where d.dict_type = #{dictType} and d.del_flag=0
</select>
--
Gitblit v1.9.2