From 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 24 十月 2022 18:12:41 +0800
Subject: [PATCH] 日志导出乱码 日志查询导出 代码重构
---
ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml b/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml
index d21673b..7ff04d6 100644
--- a/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml
@@ -40,7 +40,8 @@
d1.`level` = '2'
AND d1.type_code = '06'
<if test="keyWord !=null and keyWord !=''">
- AND d1.`name` LIKE '%${keyWord}%'
+ AND (d1.`name` LIKE '%${keyWord}%'
+ or d2.`name` LIKE '%${keyWord}%')
</if>
</where>
@@ -53,19 +54,24 @@
d2.`name` AS typeFirst,
d3.`name` AS typeSecond,
d4.`name` AS typeThird
- FROM
- `ums_data_dictionary` AS d1
- JOIN ums_data_dictionary AS d2 ON d1.parent_id = d2.id
- JOIN ums_data_dictionary AS d3 ON d2.parent_id = d3.id
- JOIN ums_data_dictionary AS d4 ON d3.parent_id = d4.id
+ FROM `ums_data_dictionary` AS d1
+ LEFT JOIN ums_data_dictionary AS d2 ON d1.parent_id = d2.id
+ LEFT JOIN ums_data_dictionary AS d3 ON d2.parent_id = d3.id
+ LEFT JOIN ums_data_dictionary AS d4 ON d3.parent_id = d4.id
<where>
d1.`level` = '4'
AND d1.type_code = '01'
<if test="keyWord !=null and keyWord !=''">
- AND d1.`name` LIKE '%${keyWord}%'
+ AND (d1.`name` LIKE '%${keyWord}%'
+ or d2.`name` LIKE '%${keyWord}%'
+ or d3.`name` LIKE '%${keyWord}%'
+ or d4.`name` LIKE '%${keyWord}%'
+ )
</if>
</where>
+
+ ORDER BY d1.parent_id,d2.parent_id,d3.parent_id,d4.parent_id
</select>
</mapper>
--
Gitblit v1.8.0