From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/resources/mapper/UserMapper.xml | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index bcbc3fb..b062eb3 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -17,8 +17,38 @@
<result column="update_time" property="updateTime"/>
<result column="expire_time" property="expireTime"/>
<result column="is_delete" property="isDelete"/>
+ <!--������������-->
+ <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" property="locationLevel"/>
+ </association>
+ <!--���������-->
+ <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>
+
+
<select id="selectUsers" resultType="java.util.Map">
SELECT id,account,user_name userName,email,mobile,wechat FROM `user` WHERE
<if test="orgId!=null">
--
Gitblit v1.8.0