From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/resources/mapper/UserMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index bf95aac..653ac42 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -17,6 +17,7 @@
<result column="update_time" property="updateTime"/>
<result column="expire_time" property="expireTime"/>
<result column="is_delete" property="isDelete"/>
+ <result column="unit_id" property="unitId"/>
</resultMap>
<resultMap id="userInfoMap" type="com.moral.api.pojo.bo.UserBO" extends="BaseResultMap">
@@ -25,27 +26,28 @@
<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"/>
+ <result column="org_expire_time" property="expireTime"/>
</association>
<!--���������-->
- <collection property="groups" ofType="com.moral.api.entity.Group" javaType="java.util.ArrayList">
+ <association property="group" javaType="com.moral.api.entity.Group">
<id column="group_id" property="id" jdbcType="INTEGER"/>
<result column="group_name" property="groupName" jdbcType="VARCHAR"/>
- </collection>
+ </association>
</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
+ o.name, o.location_level_code, o.expire_time org_expire_time,
+ a.id group_id , a.group_name,u.unit_id
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
+ 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}
+ AND u.is_delete = '0'
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0