From f93ccd68e914c8d9c83478bfa3f5ccf7bc48a44f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 30 一月 2023 18:08:53 +0800
Subject: [PATCH] update 优化 框架代码书写格式

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java
index c82f73d..30d4f7d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.ruoyi.system.domain.SysRole;
 import com.ruoyi.system.domain.SysUser;
 import lombok.RequiredArgsConstructor;
@@ -28,7 +29,7 @@
      * @return 瑙掕壊鏉冮檺淇℃伅
      */
     public Set<String> getRolePermission(SysUser user) {
-        Set<String> roles = new HashSet<String>();
+        Set<String> roles = new HashSet<>();
         // 绠$悊鍛樻嫢鏈夋墍鏈夋潈闄�
         if (user.isAdmin()) {
             roles.add("admin");
@@ -45,13 +46,13 @@
      * @return 鑿滃崟鏉冮檺淇℃伅
      */
     public Set<String> getMenuPermission(SysUser user) {
-        Set<String> perms = new HashSet<String>();
+        Set<String> perms = new HashSet<>();
         // 绠$悊鍛樻嫢鏈夋墍鏈夋潈闄�
         if (user.isAdmin()) {
             perms.add("*:*:*");
         } else {
             List<SysRole> roles = user.getRoles();
-            if (!roles.isEmpty() && roles.size() > 1) {
+            if (CollUtil.isNotEmpty(roles)) {
                 // 澶氳鑹茶缃畃ermissions灞炴�э紝浠ヤ究鏁版嵁鏉冮檺鍖归厤鏉冮檺
                 for (SysRole role : roles) {
                     Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());

--
Gitblit v1.9.3