From 51c36e6f6b17862714fbd5c42da43386dc05d28a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Apr 2021 14:32:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/resources/mapper/UserMapper.xml | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index bcbc3fb..bf95aac 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -19,13 +19,33 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <select id="selectUsers" resultType="java.util.Map">
- SELECT id,account,user_name userName,email,mobile,wechat FROM `user` WHERE
- <if test="orgId!=null">
- organization_id = #{orgId}
- </if>
- <if test="userId!=null">
- id = #{userId}
- </if>
+ <resultMap id="userInfoMap" type="com.moral.api.pojo.bo.UserBO" extends="BaseResultMap">
+ <!--������������-->
+ <association property="organization" javaType="com.moral.api.entity.Organization">
+ <result column="id" property="id" jdbcType="INTEGER"/>
+ <result column="name" property="name" jdbcType="VARCHAR"/>
+ <result column="location_level_code" property="locationLevelCode"/>
+ <result column="org_expire_ime" property="expireTime"/>
+ </association>
+ <!--���������-->
+ <collection property="groups" ofType="com.moral.api.entity.Group" javaType="java.util.ArrayList">
+ <id column="group_id" property="id" jdbcType="INTEGER"/>
+ <result column="group_name" property="groupName" jdbcType="VARCHAR"/>
+ </collection>
+ </resultMap>
+
+ <!--������������������������������������������-->
+ <select id="selectUserInfo" resultMap="userInfoMap">
+ SELECT u.id, u.account, u.password, u.user_name, u.email, u.mobile, u.wechat ,u.organization_id, u.expire_time, u.is_delete,u.is_Admin,
+ o.name, o.location_level_code, o.expire_time org_expire_ime,
+ a.id group_id , a.group_name
+ FROM `user` u
+ LEFT JOIN
+ (SELECT ug.user_id,g.id,g.group_name FROM `user_group` ug ,`group` g WHERE ug.group_id=g.id AND g.is_delete = 0
+ AND ug.is_delete = 0) a
+ ON a.user_id=u.id
+ LEFT JOIN `organization` o ON o.id=u.organization_id
+ WHERE u.account = #{account}
</select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0