From c8638df756d5c56f2d0c3ed35522fc5a340122c8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 15:12:22 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 bf788dc..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,6 +2,7 @@
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.constant.Const;
@@ -12,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;
@@ -28,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;
@@ -49,6 +52,8 @@
@Autowired
private IRoleService roleService;
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
/**
@@ -102,7 +107,8 @@
@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));
}
@@ -116,10 +122,10 @@
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;
}
@@ -203,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;
}
@@ -215,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