From 99e97b2fdc6f5695021f78e543505140afbfc503 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 11 Jul 2024 17:57:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=A7=92=E8=89=B2=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=83=E9=99=90=E7=AD=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/portal/apiadmin/SysUserRest.java   |  2 +-
 .../yxt/portal/biz/sysuser/SysUserService.java | 18 +++++++++++++++++-
 .../biz/sysuserrole/SysUserRoleMapper.xml      |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

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<String> 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<SysUserMapper, SysUser> {
         List<String> userSidList = baseMapper.selectUserByStaffSid(staffList);
         return rb.success().setData(userSidList);
     }
-
     public ResultBean<String> selectPrivilegeLevel(PrivilegeQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String defalutId = "";
+        List<String> 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<String> selectPrivilegeLevel1(PrivilegeQuery query) {
         ResultBean<String> 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 @@
     </delete>
 
 	<select id="selectRoleSid" resultType="java.lang.String">
-		select distinct roleSid from sys_user_role where userSid = #{userSid}
+		select distinct dataRuleId from sys_user_role a left join sys_role b on a.roleSid =b.sid  where userSid = #{userSid} order by dataRuleId limit 1
     </select>
 
 	<select id="selectByUserSids" resultType="java.lang.String">