From c9a7198eb87bcd7ac8d2b21d6cf9d977e726fdd2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 七月 2024 10:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/DepartmentMapper.xml | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DepartmentMapper.xml b/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
index f0a3326..463e3ba 100644
--- a/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
@@ -6,17 +6,6 @@
FROM department
</select>
- <select id="showUserById" resultType="com.yuanchu.mom.dto.UserDto">
- select * from (select id, name, age, email, phone,depart_id
- from user where state=1 and SUBSTRING_INDEX(depart_id, ',', -1) in
- <foreach collection="ids" item="id" separator="," open="(" close=")">
- #{id}
- </foreach> ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
-
<select id="selectSonById" resultType="java.lang.Integer">
SELECT au.id
FROM (SELECT * FROM department WHERE father_id IS NOT NULL) au,
@@ -29,4 +18,7 @@
WHERE id = #{id}
ORDER BY id
</select>
+ <select id="selectCustomList" resultType="com.yuanchu.mom.dto.DepartmentDto">
+ select id, name, category fatherId from role;
+ </select>
</mapper>
--
Gitblit v1.9.3