From 574f3e567a9b95949fbd0c15e10cbc2b5439dc7b Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期三, 14 十二月 2022 17:23:17 +0800
Subject: [PATCH] 趋势分析接口修改
---
ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml | 73 +++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
index c62face..78369f0 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,15 +34,16 @@
<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">
- <id column="role_id" property="id" />
- <result column="name" property="name" />
- <result column="description" property="description" />
- <result column="admin_count" property="adminCount" />
- <result column="role_create_time" property="createTime" />
- <result column="role_status" property="status" />
- <result column="sort" property="sort" />
+ </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"/>
+ <result column="admin_count" property="adminCount"/>
+ <result column="role_create_time" property="createTime"/>
+ <result column="role_status" property="status"/>
+ <result column="sort" property="sort"/>
</collection>
</resultMap>
@@ -54,29 +56,20 @@
<select id="selectCondPage" parameterType="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,
- ur.id role_id,
- ur.id NAME,
- ur.description,
- ur.admin_count,
- ur.create_time role_create_time,
- ur.STATUS role_status,
- ur.sort
+ 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
- LEFT JOIN ums_admin_role_relation uarr ON ua.id = uarr.admin_id
- LEFT JOIN ums_role ur ON uarr.role_id = ur.id
+ 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
<where>
<if test="umsAdmin.keyword !=null and umsAdmin.keyword !=''">
AND (ua.username LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
@@ -91,7 +84,19 @@
</if>
</where>
ORDER BY
- ua.id DESC
+ ua.id DESC
</select>
-
+ <select id="selectAdminRoles" parameterType="java.lang.Long" resultType="com.ycl.entity.user.UmsRole">
+ select ur.id role_id,
+ ur.name NAME,
+ ur.description,
+ ur.admin_count,
+ ur.create_time role_create_time,
+ ur.STATUS role_status,
+ ur.sort
+ from ums_admin ua
+ LEFT JOIN ums_admin_role_relation uarr ON ua.id = uarr.admin_id
+ left join ums_role ur on uarr.role_id = ur.id
+ where ua.id = #{id}
+ </select>
</mapper>
--
Gitblit v1.8.0