From b8fe4c7b5f4f03dcfadff95702a07040ab9a1b57 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 27 Sep 2023 11:08:28 +0800
Subject: [PATCH] feat:补充提交
---
screen-api/src/main/resources/mapper/UserMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index cc4fe83..9d655cf 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -28,17 +28,17 @@
<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_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