manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增 条件规则数据权限、自定义SQL数据权限，暂存

Browse Source
This commit is contained in:
thinkgem
2025-02-12 18:36:58 +08:00
parent af83d8fb2d
commit 6a985081b6
4 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/core/src/main/java/com/jeesite/modules/sys/web/RoleController.java
View File

@@ -304,16 +304,26 @@ public class RoleController extends BaseController {
@RequiresPermissions("sys:role:edit")
@RequestMapping(value = "formAuthDataScope")
public String formAuthDataScope(Role role, Model model, HttpServletRequest request) {
// 拥有的角色数据权限
RoleDataScope roleDataScope = new RoleDataScope();
roleDataScope.setRoleCode(role.getRoleCode());
List<RoleDataScope> roleDataScopeList = roleService.findDataScopeList(roleDataScope);
model.addAttribute("roleDataScopeList", roleDataScopeList);
// 拥有的菜单数据权限
MenuDataScope menuDataScope = new MenuDataScope();
menuDataScope.setRoleCode(role.getRoleCode());
List<MenuDataScope> menuDataScopeList = roleService.findMenuDataScopeList(menuDataScope);
model.addAttribute("menuDataScopeList", menuDataScopeList);
// 查询角色数据权限，包括菜单数据权限
if (Global.TRUE.equals(role.getMenuCode())){
// 拥有的角色数据权限
RoleDataScope roleDataScope = new RoleDataScope();
roleDataScope.setRoleCode(role.getRoleCode());
List<RoleDataScope> roleDataScopeList = roleService.findDataScopeList(roleDataScope);
model.addAttribute("roleDataScopeList", roleDataScopeList);
// 拥有的菜单数据权限
MenuDataScope menuDataScope = new MenuDataScope();
menuDataScope.setRoleCode(role.getRoleCode());
List<MenuDataScope> menuDataScopeList = roleService.findMenuDataScopeList(menuDataScope);
model.addAttribute("menuDataScopeList", menuDataScopeList);
} else {
// 拥有的角色数据权限
RoleDataScope roleDataScope = new RoleDataScope();
roleDataScope.setRoleCode(role.getRoleCode());
roleDataScope.setMenuCode(RoleDataScope.DEFAULT_MENU_CODE);
List<RoleDataScope> roleDataScopeList = roleService.findDataScopeList(roleDataScope);
model.addAttribute("roleDataScopeList", roleDataScopeList);
}
// 设置其它对象
model.addAttribute("role", role);
model.addAttribute("moduleCodes", ModuleUtils.getEnableModuleCodes());

3
modules/core/src/main/resources/config/jeesite-core.yml
View File

@@ -283,6 +283,9 @@ user:
# v5.10.1 开始默认关闭 JOIN 模式的数据权限，如有需要可打开此参数
dataScopeJoinMode: false
# 菜单数据权限，是否启用自定义 SQL 执行权限 v5.10.1
dataScopeRuleSql: false
# 角色管理
role:
# 扩展数据权限定义：3：本部门；4：本公司；5：本部门和本公司