From 923510deed8c991823db60dbd430bf18d78b98cb Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 07 Apr 2021 17:27:24 +0800
Subject: [PATCH] 登陆用户信息返回修改，用户组查询修改
---
screen-api/src/main/resources/mapper/UserMapper.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index 532a523..bf95aac 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -19,25 +19,26 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <resultMap id="userInfoMap" type="com.moral.api.pojo.UserBO" extends="BaseResultMap">
+ <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" property="locationLevel"/>
+ <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="groupId" property="id" jdbcType="INTEGER"/>
+ <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.organization_id, u.expire_time, u.is_delete,u.is_Admin,
- o.name, o.location_level,
- a.id groupId , a.group_name
+ 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
--
Gitblit v1.8.0