From 14f96ba18b58cda204d10608c1abfe9a1d78a495 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 10 六月 2026 20:21:31 +0800
Subject: [PATCH] bug fix
---
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
index 42186a2..24b86ca 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
@@ -17,8 +17,10 @@
import com.stylefeng.guns.core.util.Convert;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.Role;
+import com.stylefeng.guns.modular.system.model.SysUserCompanyScope;
import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.service.IRoleService;
+import com.stylefeng.guns.modular.system.service.ISysUserCompanyScopeService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.warpper.RoleWarpper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +53,9 @@
@Autowired
private IRoleService roleService;
+
+ @Autowired
+ private ISysUserCompanyScopeService userCompanyScopeService;
/**
@@ -220,7 +225,8 @@
public List<ZTreeNode> roleTreeListByUserId(@PathVariable Integer userId) {
User theUser = this.userService.selectById(userId);
ShiroUser user1 = ShiroKit.getUser();
- String roleid = theUser.getRoleid();
+ SysUserCompanyScope scope = userCompanyScopeService.selectActiveScope(userId, user1.getObjectId());
+ String roleid = scope == null ? theUser.getRoleid() : scope.getRoleid();
if (ToolUtil.isEmpty(roleid)) {
List<ZTreeNode> roleTreeList = this.roleService.roleTreeList(user1.getObjectId());
return roleTreeList;
--
Gitblit v1.7.1