From 8fc7f5825913b23aadd7d535dbdcb973a2e778f3 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Mon, 21 Mar 2022 10:05:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/mapper/xml/SysCategoryMapper.xml   | 19 ++++++++++---------
 .../system/mapper/xml/SysDictMapper.xml       | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
index 96181a60b..2c5450203 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
@@ -24,15 +24,16 @@
 		where is_tag_dict=1 and sys_dict_id=#{params.sys_dict_id}
 
 		<!--搜索条件:标签名称包含%,单独搜索-->
-		<choose>
-			<when test='params.name != null and params.name != "" and params.name.contains("%")'>
-				and name like '%1%%' escape '1'
-			</when>
-			<otherwise>
-				and name like concat('%',#{params.name},'%')
-			</otherwise>
-		</choose>
-
+		<if test="params.name != null and params.name != ''">
+			<choose>
+				<when test='params.name != null and params.name != "" and params.name.contains("%")'>
+					and name like '%1%%' escape '1'
+				</when>
+				<otherwise>
+					and name like concat('%',#{params.name},'%')
+				</otherwise>
+			</choose>
+		</if>
 		order by create_time desc
 	</select>
 </mapper>
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml
index fc8f12350..d1610c7fb 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml
@@ -150,15 +150,16 @@
 		</choose>-->
 
 		<!--搜索条件:标签名称包含%,单独搜索-->
-		<choose>
-			<when test='params.dictName != null and params.dictName != "" and params.dictName.contains("%")'>
-				and dict_name like '%1%%' escape '1'
-			</when>
-			<otherwise>
-				and dict_name like concat('%',#{params.dictName},'%')
-			</otherwise>
-		</choose>
-
+		<if test="params.dbFieldTxt != null and params.dbFieldTxt != ''">
+			<choose>
+				<when test='params.dictName != null and params.dictName != "" and params.dictName.contains("%")'>
+					and dict_name like '%1%%' escape '1'
+				</when>
+				<otherwise>
+					and dict_name like concat('%',#{params.dictName},'%')
+				</otherwise>
+			</choose>
+		</if>
 
 		order by d.create_time desc
 	</select>