From ebb1a448339bafc4c4849fdbc2291bd3a28261df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 09 一月 2024 10:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
index 1bf44a2..de105cc 100644
--- a/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
+++ b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
@@ -50,7 +50,7 @@
FROM ums_depart ud
WHERE is_deleted = 0
<if test="departName!=null and departName!=''">
- and ud.name like CONCAT('%',#{departName},'%')
+ and ud.depart_name like CONCAT('%',#{departName},'%')
</if>
ORDER BY ud.parent_id,ud.id desc
LIMIT #{offset}, #{size}
@@ -94,4 +94,7 @@
HAVING
count( * )= 1
</select>
+ <select id="getDepartType" resultType="java.lang.String">
+ select name from ums_data_dictionary where id = #{id}
+ </select>
</mapper>
--
Gitblit v1.8.0