From f61711cd8ff779fc4699fa5edbcf18d8b2f6aef9 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 18:17:37 +0800
Subject: [PATCH] 驾驶舱接口修改
---
ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
index 737fc65..77fdbc8 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
@@ -10,6 +10,7 @@
<result column="icon" property="icon"/>
<result column="email" property="email"/>
<result column="nick_name" property="nickName"/>
+ <result column="sex" property="sex"/>
<result column="note" property="note"/>
<result column="create_time" property="createTime"/>
<result column="login_time" property="loginTime"/>
@@ -23,7 +24,7 @@
<result column="mobile" property="mobile"/>
</resultMap>
<resultMap type="com.ycl.entity.user.UmsAdmin" id="CondMapResultMap" extends="BaseResultMap">
- <association property="depart" javaType="com.ycl.entity.depart.UmsDepart">
+ <collection property="depart" javaType="ArrayList" ofType="com.ycl.entity.depart.UmsDepart">
<id column="depart_id" property="id"/>
<result column="depart_name" property="departName"/>
<result column="depart_des" property="departDes"/>
@@ -33,8 +34,9 @@
<result column="depart_create_time" property="createTime"/>
<result column="depart_update_time" property="updateTime"/>
<result column="is_deleted" property="isDeleted"/>
- </association>
- <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole" column="id" select="selectAdminRoles">
+ </collection>
+ <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole" column="id"
+ select="selectAdminRoles">
<id column="role_id" property="id"/>
<result column="name" property="name"/>
<result column="description" property="description"/>
@@ -97,4 +99,23 @@
left join ums_role ur on uarr.role_id = ur.id
where ua.id = #{id}
</select>
+ <select id="selectToExp" resultType="com.ycl.entity.user.UmsAdmin" resultMap="CondMapResultMap">
+ SELECT
+ ua.*,
+ ud.id depart_id,
+ ud.depart_name,
+ ud.depart_des,
+ ud.depart_type,
+ ud.parent_id,
+ ud.create_time depat_create_time,
+ ud.update_time depat_update_time,
+ ud.STATUS depart_status,
+ ud.is_deleted
+ FROM
+ ums_admin ua
+ LEFT JOIN ums_depart_manager udm ON ua.id = udm.user_id
+ LEFT JOIN ums_depart ud ON udm.depart_id = ud.id
+ ORDER BY
+ ua.id DESC
+ </select>
</mapper>
--
Gitblit v1.8.0