From 7197100ac3c37795e43f0826c5476ca7aca637cd Mon Sep 17 00:00:00 2001
From: hecaifeng <18810382694@163.com>
Date: Thu, 2 Jan 2025 09:39:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=BE=AA=E7=8E=AF=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysRoleServiceImpl.java      | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/rds-console/console-system/src/main/java/com/tongtech/system/service/impl/SysRoleServiceImpl.java b/rds-console/console-system/src/main/java/com/tongtech/system/service/impl/SysRoleServiceImpl.java
index 901457b..b9408d9 100644
--- a/rds-console/console-system/src/main/java/com/tongtech/system/service/impl/SysRoleServiceImpl.java
+++ b/rds-console/console-system/src/main/java/com/tongtech/system/service/impl/SysRoleServiceImpl.java
@@ -62,17 +62,32 @@ public class SysRoleServiceImpl implements ISysRoleService
     {
         List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
         List<SysRole> roles = selectRoleAll();
-        for (SysRole role : roles)
-        {
-            for (SysRole userRole : userRoles)
-            {
-                if (role.getRoleId().longValue() == userRole.getRoleId().longValue())
-                {
-                    role.setFlag(true);
-                    break;
-                }
+//        for (SysRole role : roles)
+//        {
+//            for (SysRole userRole : userRoles)
+//            {
+//                if (role.getRoleId().longValue() == userRole.getRoleId().longValue())
+//                {
+//                    role.setFlag(true);
+//                    break;
+//                }
+//            }
+//        }
+//        return roles;
+
+        // 使用 Set 来存储用户角色的 ID
+        Set<Long> userRoleIds = new HashSet<>();
+        for (SysRole userRole : userRoles) {
+            userRoleIds.add(userRole.getRoleId());
+        }
+
+        // 遍历所有角色，并检查其是否在用户角色ID集合中
+        for (SysRole role : roles) {
+            if (userRoleIds.contains(role.getRoleId())) {
+                role.setFlag(true);
             }
         }
+
         return roles;
     }
 
-- 
Gitee