From 3cf5e9483f60c94d29df1a79bc0c1ca910ca46ef Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 13 十二月 2022 14:58:24 +0800
Subject: [PATCH] fix: 执法事件对外接口
---
ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 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..e2b5f47 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,13 +52,46 @@
<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>
+ <select id="selectSurplusUser" resultType="com.ycl.entity.user.UmsAdmin">
+ SELECT
+ t.id,
+ t3.username
+ FROM
+ ( SELECT t1.id FROM ums_admin t1 UNION ALL SELECT t2.user_id FROM ums_depart_manager t2 ) t
+ LEFT JOIN ums_admin t3 on t3.id =t.id
+ GROUP BY
+ id
+ HAVING
+ count( * )= 1
+ </select>
+ <select id="selectSurplusUserAndExistUser" resultType="com.ycl.entity.user.UmsAdmin" parameterType="java.lang.Long">
+ SELECT
+ t4.id,
+ t4.username
+ FROM
+ ums_depart_manager t3
+ LEFT JOIN ums_admin t4 ON t3.user_id = t4.id
+ WHERE
+ t3.depart_id = #{id} UNION ALL
+ SELECT
+ t.id,
+ t3.username
+ FROM
+ ( SELECT t1.id FROM ums_admin t1 UNION ALL SELECT t2.user_id FROM ums_depart_manager t2 ) t
+ LEFT JOIN ums_admin t3 ON t3.id = t.id
+ GROUP BY
+ id
+ HAVING
+ count( * )= 1
+ </select>
</mapper>
--
Gitblit v1.8.0