From 25a977a6408fe6ba20ddacf6f43bee2fe93eb17b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 05 Sep 2023 08:41:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/resources/mapper/GroupMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/GroupMapper.xml b/screen-api/src/main/resources/mapper/GroupMapper.xml
index 36edc9d..b24ccb4 100644
--- a/screen-api/src/main/resources/mapper/GroupMapper.xml
+++ b/screen-api/src/main/resources/mapper/GroupMapper.xml
@@ -12,13 +12,13 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <select id="selectUserGroup" resultMap="GroupResultMap">
- SELECT g.id,g.group_name
+ <select id="selectUserGroup" resultType="java.util.Map">
+ SELECT g.id,g.group_name groupName
FROM `group` g,`user_group` ug
WHERE ug.user_id = #{userId}
AND ug.group_id = g.id
- AND g.is_delete = 0
- AND ug.is_delete = 0
+ AND g.is_delete = '0'
+ AND ug.is_delete = '0'
ORDER BY g.id
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0