From fe9177cd7d4ea1e512e819c831e0d8ea14f561d2 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 24 May 2023 17:15:23 +0800
Subject: [PATCH] 1

---
 .../com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java   | 2 ++
 .../com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml    | 8 ++++++++
 .../com/yxt/anrui/portal/biz/sysrole/SysRoleService.java  | 4 ++++
 .../com/yxt/anrui/portal/biz/sysuser/SysUserService.java  | 5 +----
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java
index 91e5b4a73b..77d91517a4 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java
@@ -66,4 +66,6 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
     List<SysMenuRoleVoList> selectMobileRoleList(String menuSid);
 
 	List<String> selectByRole(@Param("orgLevelKey") String orgLevelKey, @Param("menuSid") String menuSid,@Param("userSid") String userSid);
+
+    List<String> selectByMobileRole(@Param("orgLevelKey") String orgLevelKey, @Param("menuSid") String menuSid,@Param("userSid") String userSid);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml
index dc46f85105..686bdbeda0 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml
@@ -112,4 +112,12 @@
         left join sys_user_role sur on sur.roleSid = smr.roleSid
         where smr.menuSid = #{menuSid} and sur.userSid = #{userSid} and sr.roleType = #{orgLevelKey} order by dataRuleId asc
     </select>
+
+    <select id="selectByMobileRole" resultType="java.lang.String">
+        select dataRuleId from sys_mobile_menu_role smr
+        left join sys_mobile_menu sm on sm.sid = smr.menuSid
+        left join sys_role sr on sr.sid = smr.roleSid
+        left join sys_user_role sur on sur.roleSid = smr.roleSid
+        where smr.menuSid = #{menuSid} and sur.userSid = #{userSid} and sr.roleType = #{orgLevelKey} order by dataRuleId asc
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java
index 14820273b4..eb68966300 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java
@@ -181,4 +181,8 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
     public List<String> selectByRole(String orgLevelKey, String menuSid,String userSid) {
         return baseMapper.selectByRole(orgLevelKey,menuSid,userSid);
     }
+
+    public List<String> selectByMobileRole(String orgLevelKey, String menuSid, String userSid) {
+        return baseMapper.selectByMobileRole(orgLevelKey,menuSid,userSid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
index 8a845b8f86..9ac6779801 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
@@ -1432,7 +1432,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             //最后一级的sid所属层级
             SysOrganization sysOrganization = sysOrganizationService.fetchBySid(stringList.get(stringList.size() - 1));
             //查询层级对应的角色权限id
-            List<String> roleSid = sysRoleService.selectByRole(sysOrganization.getOrgLevelKey(), menuSid,query.getUserSid());
+            List<String> roleSid = sysRoleService.selectByMobileRole(sysOrganization.getOrgLevelKey(), menuSid,query.getUserSid());
             roleSid.removeAll(Collections.singleton(null));
             if (!roleSid.isEmpty()) {
                 for (int i = 0; i < roleSid.size(); i++) {
@@ -1445,9 +1445,6 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 }
             }
         }
-        if(StringUtils.isBlank(defalutId)) {
-            defalutId = "0";
-        }
         return rb.success().setData(defalutId);
     }
 }
\ No newline at end of file