From 0c82398dad95f536e22b5e1966f79aa29b2cf1c9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 七月 2025 19:34:39 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
index 287755f..c79418b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
@@ -2,9 +2,9 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.Tip;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.cache.CacheKit;
import com.stylefeng.guns.core.common.annotion.BussinessLog;
-import com.stylefeng.guns.core.common.annotion.Permission;
import com.stylefeng.guns.core.common.constant.Const;
import com.stylefeng.guns.core.common.constant.cache.Cache;
import com.stylefeng.guns.core.common.constant.dictmap.RoleDict;
@@ -13,6 +13,7 @@
import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.Convert;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.Role;
@@ -29,6 +30,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
@@ -50,6 +52,8 @@
@Autowired
private IRoleService roleService;
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
/**
@@ -71,7 +75,6 @@
/**
* 跳转到修改角色
*/
- @Permission
@RequestMapping(value = "/role_edit/{roleId}")
public String roleEdit(@PathVariable Integer roleId, Model model) {
if (ToolUtil.isEmpty(roleId)) {
@@ -88,7 +91,6 @@
/**
* 跳转到角色分配
*/
- @Permission
@RequestMapping(value = "/role_assign/{roleId}")
public String roleAssign(@PathVariable("roleId") Integer roleId, Model model) {
if (ToolUtil.isEmpty(roleId)) {
@@ -102,11 +104,11 @@
/**
* 获取角色列表
*/
- @Permission
@RequestMapping(value = "/list")
@ResponseBody
public Object list(@RequestParam(required = false) String roleName) {
- List<Map<String, Object>> roles = this.roleService.selectRoles(super.getPara("roleName"));
+ ShiroUser user1 = shiroExtUtil.getUser();
+ List<Map<String, Object>> roles = this.roleService.selectRoles(super.getPara("roleName"), user1.getObjectId());
return super.warpObject(new RoleWarpper(roles));
}
@@ -115,16 +117,15 @@
*/
@RequestMapping(value = "/add")
@BussinessLog(value = "添加角色", key = "name", dict = RoleDict.class)
- @Permission(Const.ADMIN_NAME)
@ResponseBody
public Tip add(@Valid Role role, BindingResult result) {
if (result.hasErrors()) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
+ ShiroUser user1 = shiroExtUtil.getUser();
role.setId(null);
+ role.setObjectId(user1.getObjectId());
this.roleService.insert(role);
-
-
return SUCCESS_TIP;
}
@@ -133,7 +134,6 @@
*/
@RequestMapping(value = "/edit")
@BussinessLog(value = "修改角色", key = "name", dict = RoleDict.class)
- @Permission(Const.ADMIN_NAME)
@ResponseBody
public Tip edit(@Valid Role role, BindingResult result) {
if (result.hasErrors()) {
@@ -152,7 +152,6 @@
*/
@RequestMapping(value = "/remove")
@BussinessLog(value = "删除角色", key = "roleId", dict = RoleDict.class)
- @Permission(Const.ADMIN_NAME)
@ResponseBody
public Tip remove(@RequestParam Integer roleId) {
if (ToolUtil.isEmpty(roleId)) {
@@ -194,7 +193,6 @@
*/
@RequestMapping("/setAuthority")
@BussinessLog(value = "配置权限", key = "roleId,ids", dict = RoleDict.class)
- @Permission(Const.ADMIN_NAME)
@ResponseBody
public Tip setAuthority(@RequestParam("roleId") Integer roleId, @RequestParam("ids") String ids) {
if (ToolUtil.isOneEmpty(roleId)) {
@@ -211,7 +209,8 @@
@RequestMapping(value = "/roleTreeList")
@ResponseBody
public List<ZTreeNode> roleTreeList() {
- List<ZTreeNode> roleTreeList = this.roleService.roleTreeList();
+ ShiroUser user1 = shiroExtUtil.getUser();
+ List<ZTreeNode> roleTreeList = this.roleService.roleTreeList(user1.getObjectId());
roleTreeList.add(ZTreeNode.createParent());
return roleTreeList;
}
@@ -223,13 +222,14 @@
@ResponseBody
public List<ZTreeNode> roleTreeListByUserId(@PathVariable Integer userId) {
User theUser = this.userService.selectById(userId);
+ ShiroUser user1 = shiroExtUtil.getUser();
String roleid = theUser.getRoleid();
if (ToolUtil.isEmpty(roleid)) {
- List<ZTreeNode> roleTreeList = this.roleService.roleTreeList();
+ List<ZTreeNode> roleTreeList = this.roleService.roleTreeList(user1.getObjectId());
return roleTreeList;
} else {
String[] strArray = Convert.toStrArray(",", roleid);
- List<ZTreeNode> roleTreeListByUserId = this.roleService.roleTreeListByRoleId(strArray);
+ List<ZTreeNode> roleTreeListByUserId = this.roleService.roleTreeListByRoleId(strArray, user1.getObjectId());
return roleTreeListByUserId;
}
}
--
Gitblit v1.7.1