From 8e03347f04931ccff7190a4703f2522d8600e5db Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Thu, 17 Mar 2022 11:48:50 +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/SysDictMapper.xml       | 25 +++++++++----------
 .../tag/mapper/xml/OnlCgformTagMapper.xml     | 15 +++++------
 2 files changed, 18 insertions(+), 22 deletions(-)

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 aa46cbd27..a4e1756d2 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
@@ -135,19 +135,18 @@
 		i.item_text as attribute_type_name,i.en_name as attribute_type_en_name
 		from sys_dict as d
 		left join sys_dict_item as i on d.attribute_type=i.item_value
-		where i.dict_id="1494570247913512962" and d.del_flag=0
-		<if test="params.cut='cn'">
-			<if test="params.dictName != null and params.dictName != ''">
-				and d.dict_en_name like concat('%',#{params.dictName},'%')
-			</if>
-		</if>
-
-		<if test="params.cut='en'">
-			<if test="params.dictName != null and params.dictName != ''">
-				and d.dict_en_name like concat('%',#{params.dictName},'%')
-			</if>
-		</if>
-		order by f.create_time desc
+		where i.dict_id="1494570247913512962" and d.del_flag=0 and d.is_tag_dict=1
+		<choose>
+			<when test="params.dictName != null and params.dictName != ''">
+				<if test='params.cut="cn"'>
+					and d.dict_name like concat('%',#{params.dictName},'%')
+				</if>
 
+				<if test='params.cut="en"'>
+					and d.dict_en_name like concat('%',#{params.dictName},'%')
+				</if>
+			</when>
+		</choose>
+		order by d.create_time desc
 	</select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml
index 2faa6072b..ce6e236d1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml
@@ -41,24 +41,21 @@
         where f.cgform_head_id="48308196e7b04761b533dc31bc899707"
         and f.is_delete=0
         and i.dict_id=1493098515761917954
-        <!--<choose>
-            <when test="params.cut='cn' ">
-                <if test="params.dbFieldTxt != null and params.dbFieldTxt != ''">
+        <choose>
+            <when test="params.dbFieldTxt != null and params.dbFieldTxt != ''">
+                <if test='params.cut="cn"'>
                     and f.db_field_txt like concat('%',#{params.dbFieldTxt},'%')
                 </if>
-            </when>
 
-            <otherwise>
-                <if test="params.dbFieldTxt != null and params.dbFieldTxt != ''">
+                <if test='params.cut="en"'>
                     and f.db_field_en_name like concat('%',#{params.dbFieldTxt},'%')
                 </if>
-            </otherwise>
-        </choose>-->
+            </when>
+        </choose>
 
         <if test="params.showArea != null and params.showArea != '' ">
             and f.show_area like concat('%',#{params.showArea},'%')
         </if>
         order by f.create_time desc
-
     </select>
 </mapper>
\ No newline at end of file