From 960380f89c9371ba309d6c50b1ab1b677ea74575 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 26 八月 2025 20:51:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index bb1227b..e81e645 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -94,22 +94,13 @@
@Override
public Set<String> selectRolePermissionByUserId(SysUser user) {
Set<String> permsSet = new HashSet<>();
- if(user.getRoleType() == 1){
+ //平台
List<SysRole> perms = roleMapper.selectRolePermissionByUserId(user.getUserId());
for (SysRole perm : perms) {
if (StringUtils.isNotNull(perm)) {
permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
}
}
- }/*else{
- List<UserShop> list = userShopService.list(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId())
- .eq(UserShop::getShopId, user.getObjectId()));
- for (UserShop userShop : list) {
- if (StringUtils.isNotNull(userShop)) {
- permsSet.add(userShop.getRoleId() + "");
- }
- }
- }*/
return permsSet;
}
--
Gitblit v1.7.1