From 1ec0374d08be45c6c6854705211dbd6c067dfab7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 18 Mar 2021 17:23:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/resources/mapper/UserMapper.xml | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index b062eb3..c0a28ef 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -17,6 +17,9 @@
<result column="update_time" property="updateTime"/>
<result column="expire_time" property="expireTime"/>
<result column="is_delete" property="isDelete"/>
+ </resultMap>
+
+ <resultMap id="userInfoMap" type="com.moral.api.pojo.UserBo" extends="BaseResultMap">
<!--������������-->
<association property="organization" javaType="com.moral.api.entity.Organization">
<result column="id" property="id" jdbcType="INTEGER"/>
@@ -24,30 +27,25 @@
<result column="location_level" property="locationLevel"/>
</association>
<!--���������-->
- <collection property="groups" ofType="com.moral.api.entity.Group" javaType = "java.util.ArrayList">
+ <collection property="groups" ofType="com.moral.api.entity.Group" javaType="java.util.ArrayList">
<id column="groupId" property="id" jdbcType="INTEGER"/>
<result column="group_name" property="groupName" jdbcType="VARCHAR"/>
</collection>
-
</resultMap>
-
- <select id="selectUserInfo" resultMap="BaseResultMap">
- SELECT u.id,u.account,u.password,u.user_name,u.organization_id,u.expire_time,u.is_delete,
- o.name,u.is_admin,o.location_level,
- g.id groupId,g.group_name
- FROM `user` u,
- `organization` o,
- `user_group` ug,
- `group` g
- WHERE u.account = #{account}
- AND u.organization_id=o.id
- AND u.id = ug.user_id
- AND ug.group_id = g.id
- AND g.is_delete = 0
- AND ug.is_delete = 0
+ <!--������������������������������������������-->
+ <select id="selectUserInfo" resultMap="userInfoMap">
+ SELECT u.id, u.account, u.password, u.user_name, u.organization_id, u.expire_time, u.is_delete,u.is_Admin,
+ o.name, o.location_level,
+ a.id groupId , 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>
-
<select id="selectUsers" resultType="java.util.Map">
SELECT id,account,user_name userName,email,mobile,wechat FROM `user` WHERE
--
Gitblit v1.8.0