diff --git a/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java index eab80d6..1a2bfeb 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java @@ -914,7 +914,7 @@ public class SysUserRest { } - @ApiOperation(value = "查询角色权限的层级获取权限id") + @ApiOperation(value = "查询角色sid的权限id") @PostMapping(value = "/selectPrivilegeLevel") ResultBean selectPrivilegeLevel(@RequestBody PrivilegeQuery query) { return sysUserService.selectPrivilegeLevel(query); diff --git a/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java b/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java index d7c6c12..6db63d5 100644 --- a/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java @@ -1769,8 +1769,24 @@ public class SysUserService extends MybatisBaseService { List userSidList = baseMapper.selectUserByStaffSid(staffList); return rb.success().setData(userSidList); } - public ResultBean selectPrivilegeLevel(PrivilegeQuery query) { + ResultBean rb = ResultBean.fireFail(); + String defalutId = ""; + List roleIdList = sysUserRoleService.selectRoleSid(query.getUserSid()); + roleIdList.removeAll(Collections.singleton(null)); + if (!roleIdList.isEmpty()) { + for (int i = 0; i < roleIdList.size(); i++) { + if (StringUtils.isNotBlank(roleIdList.get(i))) { + defalutId = roleIdList.get(i); + break; + } else { + continue; + } + } + } + return rb.success().setData(defalutId); + } + public ResultBean selectPrivilegeLevel1(PrivilegeQuery query) { ResultBean rb = ResultBean.fireFail(); String defalutId = ""; if (StringUtils.isBlank(query.getMenuSid())) { diff --git a/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml index dd9d620..ea0b4c8 100644 --- a/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml @@ -59,7 +59,7 @@