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 | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index fa2b662..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">
@@ -38,7 +39,7 @@
<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_time,
- a.id group_id , a.group_name
+ 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
--
Gitblit v1.8.0