From 4109495b9c51a4bbd8b0a7c3c69093909d2e33e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 07 四月 2025 18:55:05 +0800
Subject: [PATCH] 修改接口bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 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 6182a9f..3451006 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
@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.exception.ServiceException;
@@ -10,7 +9,6 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.UserShop;
import com.ruoyi.system.domain.SysRoleDept;
import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.domain.SysUserRole;
@@ -48,8 +46,6 @@
@Resource
private UserShopService userShopService;
-
-
/**
@@ -94,20 +90,10 @@
@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() + "");
- }
+ List<SysRole> perms = roleMapper.selectRolePermissionByUserId(user.getUserId());
+ for (SysRole perm : perms) {
+ if (StringUtils.isNotNull(perm)) {
+ permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
}
}
return permsSet;
@@ -427,7 +413,7 @@
* @return
*/
@Override
- public List<SysRole> getSysRoleByIds(List<Integer> ids) {
+ public List<SysRole> getSysRoleByIds(List<Long> ids) {
return this.baseMapper.getSysRoleByIds(ids);
}
}
--
Gitblit v1.7.1