From 8a1e35934f5ad3e3febe6168e8eb990a0cd9cadb Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 15 Jul 2021 11:55:04 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/resources/mapper/GroupMapper.xml | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/GroupMapper.xml b/screen-api/src/main/resources/mapper/GroupMapper.xml
index 356729c..e54c082 100644
--- a/screen-api/src/main/resources/mapper/GroupMapper.xml
+++ b/screen-api/src/main/resources/mapper/GroupMapper.xml
@@ -12,13 +12,7 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <resultMap id="GroupResultMap" type="java.util.LinkedHashMap">
- <id column="id" property="id"/>
- <result column="group_name" property="groupName"/>
- <result column="organization_id" property="organizationId"/>
- </resultMap>
-
- <select id="selectUserGroup" resultMap="GroupResultMap">
+ <select id="selectUserGroup" resultMap="BaseResultMap">
SELECT g.id,g.group_name
FROM `group` g,`user_group` ug
WHERE ug.user_id = #{userId}
--
Gitblit v1.8.0