From 33a52c81664f821f8970c47c3e51593d643d3d6a Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Mon, 04 Mar 2024 09:48:41 +0800
Subject: [PATCH] !360 update ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml. Merge pull request !360 from 刘继东/N/A
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
index d6750af..b506636 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
@@ -5,6 +5,7 @@
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.service.ISysMenuService;
@@ -65,7 +66,7 @@
else
{
List<SysRole> roles = user.getRoles();
- if (!roles.isEmpty() && roles.size() > 1)
+ if (!CollectionUtils.isEmpty(roles))
{
// 多角色设置permissions属性，以便数据权限匹配权限
for (SysRole role : roles)
--
Gitblit v1.9.3