From 922e8c6763f9c8cd0311267b531b8b684ac5ea59 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期六, 08 十月 2022 17:41:26 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml b/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml
index ba16227..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>
@@ -54,11 +55,11 @@
d3.`name` AS typeSecond,
d4.`name` AS typeThird
FROM `ums_data_dictionary` AS d1
- LEFT JOIN ums_data_dictionary AS d2 ON d1.id = d2.parent_id
- LEFT JOIN ums_data_dictionary AS d3 ON d2.id = d3.parent_id
- LEFT JOIN ums_data_dictionary AS d4 ON d3.id = d4.parent_id
+ 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.parent_id = 0
+ d1.`level` = '4'
AND d1.type_code = '01'
<if test="keyWord !=null and keyWord !=''">
AND (d1.`name` LIKE '%${keyWord}%'
--
Gitblit v1.8.0