From ea4d3ff1ec0075eab10ef6c214653298f34d8185 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 26 八月 2023 16:22:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/resources/mapper/RoleManangeMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/user-server/src/main/resources/mapper/RoleManangeMapper.xml b/user-server/src/main/resources/mapper/RoleManangeMapper.xml
index f2d1cc1..1944922 100644
--- a/user-server/src/main/resources/mapper/RoleManangeMapper.xml
+++ b/user-server/src/main/resources/mapper/RoleManangeMapper.xml
@@ -91,6 +91,10 @@
and r.id=#{roleId}
</select>
+ <select id="getUserListRole" resultType="map">
+ SELECT CONCAT(r.`id`, '') id, r.`name`
+ FROM role r
+ </select>
<resultMap id="roleAndMenuById" type="com.yuanchu.limslaboratory.pojo.dto.RoleAndMenuDto">
<result property="roleName" column="roleName"/>
<result property="createTime" column="createTime"/>
@@ -124,4 +128,4 @@
<result property="parentId" column="parentId"/>
</collection>
</resultMap>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3