From e578b6f42af5010bba4f7acb45fe21d0e43bafb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E5=87=AF?= <371894675@qq.com>
Date: Sat, 21 Oct 2023 09:24:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=20=E5=A2=9E=E5=8A=A01.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/server/service/impl/SysRoleServiceImpl.java   | 2 ++
 .../src/main/resources/mapper/system/SysRoleMapper.xml   | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/base-system-server/src/main/java/com/health/system/server/service/impl/SysRoleServiceImpl.java b/base-system-server/src/main/java/com/health/system/server/service/impl/SysRoleServiceImpl.java
index 403d265..be7f4ee 100644
--- a/base-system-server/src/main/java/com/health/system/server/service/impl/SysRoleServiceImpl.java
+++ b/base-system-server/src/main/java/com/health/system/server/service/impl/SysRoleServiceImpl.java
@@ -91,7 +91,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
     //-------------------------------------------------------
     @Override
     public Set<String> selectEmailRoleByUserId(Integer userId,Integer roleTag) {
+        System.out.println("角色id"+userId+",角色标识"+roleTag);
         List<String> roleList=roleMapper.selectEmailRoleByUserId(userId,roleTag);
+        System.out.println("用户角色集合是:"+roleList);
         HashSet<String> roleSet = new HashSet<>();
         roleSet.addAll(roleList);
         return roleSet;
diff --git a/base-system-server/src/main/resources/mapper/system/SysRoleMapper.xml b/base-system-server/src/main/resources/mapper/system/SysRoleMapper.xml
index 9d200f3..4199a76 100644
--- a/base-system-server/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/base-system-server/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -92,13 +92,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectRoleVo"/>
 		 where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
 	</select>
-	<!--用户角色sql-->
 	<select id="selectEmailRoleByUserId" resultType="java.lang.String">
 		SELECT role_name FROM tb_user_role ur
-		    LEFT JOIN
-		    tb_role r on ur.role_id=r.role_id
-		         where ur.user_id=#{userId} and ur.role_tag=#{roleTag}
+								  LEFT JOIN
+							  tb_role r on ur.role_id=r.role_id
+		where ur.user_id=#{userId} and ur.role_tag=#{roleTag}
 	</select>
+	<!--用户角色sql-->
+
 
 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
  		insert into sys_role(