From 4d22f5928b7ca390538c7c741cca1401eb9ba284 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 二月 2023 19:03:09 +0800
Subject: [PATCH] update 更新 system 相关表接口 (sys_user) 新增 Bo Vo 类 更改请求及响应参数
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 30d4f7d..c457bc0 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,8 +1,7 @@
package com.ruoyi.system.service;
import cn.hutool.core.collection.CollUtil;
-import com.ruoyi.system.domain.SysRole;
-import com.ruoyi.system.domain.SysUser;
+import com.ruoyi.system.domain.vo.SysRoleVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -25,16 +24,17 @@
/**
* 鑾峰彇瑙掕壊鏁版嵁鏉冮檺
*
- * @param user 鐢ㄦ埛淇℃伅
+ * @param userId 鐢ㄦ埛id
+ * @param isAdmin 鏄惁绠＄悊鍛�
* @return 瑙掕壊鏉冮檺淇℃伅
*/
- public Set<String> getRolePermission(SysUser user) {
+ public Set<String> getRolePermission(Long userId, boolean isAdmin) {
Set<String> roles = new HashSet<>();
// 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄�
- if (user.isAdmin()) {
+ if (isAdmin) {
roles.add("admin");
} else {
- roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId()));
+ roles.addAll(roleService.selectRolePermissionByUserId(userId));
}
return roles;
}
@@ -42,25 +42,26 @@
/**
* 鑾峰彇鑿滃崟鏁版嵁鏉冮檺
*
- * @param user 鐢ㄦ埛淇℃伅
+ * @param userId 鐢ㄦ埛id
+ * @param isAdmin 鏄惁绠＄悊鍛�
* @return 鑿滃崟鏉冮檺淇℃伅
*/
- public Set<String> getMenuPermission(SysUser user) {
+ public Set<String> getMenuPermission(Long userId, boolean isAdmin) {
Set<String> perms = new HashSet<>();
// 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄�
- if (user.isAdmin()) {
+ if (isAdmin) {
perms.add("*:*:*");
} else {
- List<SysRole> roles = user.getRoles();
+ List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
if (CollUtil.isNotEmpty(roles)) {
// 澶氳鑹茶缃畃ermissions灞炴�э紝浠ヤ究鏁版嵁鏉冮檺鍖归厤鏉冮檺
- for (SysRole role : roles) {
+ for (SysRoleVo role : roles) {
Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());
role.setPermissions(rolePerms);
perms.addAll(rolePerms);
}
} else {
- perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+ perms.addAll(menuService.selectMenuPermsByUserId(userId));
}
}
return perms;
--
Gitblit v1.9.3