From c2be8b6fd026bd93c09891febedc1cc06e5bed7e Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 19 十月 2022 14:07:09 +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 | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
index f42ee1d..d600e03 100644
--- a/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
+++ b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
@@ -23,6 +23,7 @@
<resultMap id="DepartVOMap" type="com.ycl.vo.depart.UmsDepartVO" extends="BaseResultMap">
<result column="depart_type_name" property="departTypeName" jdbcType="VARCHAR"></result>
+ <result column="p_depart_name" property="parentDepartName" jdbcType="VARCHAR"></result>
<collection property="userInfoDTOS" javaType="ArrayList" ofType="com.ycl.dto.user.DepartUserDTO">
<id column="user_id" property="userId"/>
<result column="username" property="username"/>
@@ -43,7 +44,7 @@
SELECT t_0.*,
ua.id user_id,
ua.username,
- dd.`name` as depart_type_name,udm.is_leader
+ dd.`name` as depart_type_name,udm.is_leader,pd.depart_name as p_depart_name
FROM (
SELECT ud.*
FROM ums_depart ud
@@ -51,12 +52,13 @@
<if test="departName!=null and departName!=''">
and ud.name like CONCAT('%',#{departName},'%')
</if>
- ORDER BY create_time desc
+ ORDER BY ud.parent_id,ud.id desc
LIMIT #{offset}, #{size}
) t_0
LEFT JOIN ums_depart_manager udm ON t_0.id = udm.depart_id
LEFT JOIN ums_admin ua ON udm.user_id = ua.id
left join ums_data_dictionary as dd on t_0.depart_type = dd.id
+ left join ums_depart as pd on t_0.parent_id = pd.id
</select>
--
Gitblit v1.8.0