From 89f99008bd4b5461f31727f3049c89fa1ef6f4ae Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 17 十月 2022 22:58:36 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml | 4 +++-
1 files changed, 3 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 a477ce2..f42ee1d 100644
--- a/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
+++ b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
@@ -26,6 +26,7 @@
<collection property="userInfoDTOS" javaType="ArrayList" ofType="com.ycl.dto.user.DepartUserDTO">
<id column="user_id" property="userId"/>
<result column="username" property="username"/>
+ <result column="is_leader" property="leader" jdbcType="BOOLEAN"></result>
</collection>
</resultMap>
@@ -36,12 +37,13 @@
FROM ums_depart ud
LEFT JOIN ums_depart_manager udm ON ud.id = udm.depart_id
LEFT JOIN ums_admin ua ON udm.user_id = ua.id
+ where ud.is_deleted = 0
</select>
<select id="selectPageByName" resultMap="DepartVOMap">
SELECT t_0.*,
ua.id user_id,
ua.username,
- dd.`name` as depart_type_name
+ dd.`name` as depart_type_name,udm.is_leader
FROM (
SELECT ud.*
FROM ums_depart ud
--
Gitblit v1.8.0