From 1c940b2c9b9cb8f8591045e5048eac8de5923a14 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 04 十二月 2024 18:52:21 +0800
Subject: [PATCH] 系统管理：区域管理接口
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysRoleController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysRoleController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysRoleController.java
index cfbb21e..1abf39c 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysRoleController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysRoleController.java
@@ -41,6 +41,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import java.util.List;
+import java.util.Objects;
/**
* 角色信息
@@ -90,6 +91,15 @@
@PostMapping("/save")
public R<?> save(@Valid @RequestBody SysRoleDTO dto) {
roleService.saveRole(dto);
+ if (Objects.nonNull(dto.getRoleId())) {
+ // 更新缓存用户权限
+ LoginUser loginUser = getLoginUser();
+ if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
+ loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+ loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+ tokenService.setLoginUser(loginUser);
+ }
+ }
return R.ok();
}
@@ -105,11 +115,22 @@
return R.ok(roleService.getDetailInfo(roleId));
}
- @ApiOperation("删除详情")
+ @ApiOperation("批量删除")
@PostMapping("/deleteBatch")
public R<?> deleteBatch(@ApiParam(name = "roleIds", value = "角色id列表", required = true) @NotEmpty(message = "角色id列表不能为空") @RequestBody List<Long> roleIds) {
roleService.removeBatchByIds(roleIds);
return R.ok();
+ }
+
+ /**
+ * 获取当前登录用户可管理角色列表
+ *
+ * @return
+ */
+ @ApiOperation("获取当前登录用户可管理角色列表")
+ @GetMapping("/manageRoleList")
+ public List<SysRoleVO> getManageRoleList() {
+ return roleService.getManageRoleList(getLoginUser());
}
@PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/list")
@@ -133,13 +154,13 @@
/**
* 根据角色编号获取详细信息
*/
- @PreAuthorize("@ss.hasPermi('system:role:query')")
+ /* @PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping(value = "/{roleId}")
public AjaxResult getInfo(@PathVariable Long roleId)
{
roleService.checkRoleDataScope(roleId);
return success(roleService.selectRoleById(roleId));
- }
+ }*/
/**
* 新增角色
--
Gitblit v1.7.1