From aee4fa86f671f3227bae7416d87ac3e02b6addc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com>
Date: Tue, 25 Jun 2024 18:51:29 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9B=E5=A2=9E=E5=8A=A0=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../role/controller/RoleController.java       |  2 --
 .../role/service/CoreRoleService.java         |  6 ++---
 .../resources/mapper/CoreRoleUserMapper.xml   | 26 ++++++++++++-------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/springboot-role/src/main/java/com/tiesheng/role/controller/RoleController.java b/springboot-role/src/main/java/com/tiesheng/role/controller/RoleController.java
index 9130174..71a479c 100644
--- a/springboot-role/src/main/java/com/tiesheng/role/controller/RoleController.java
+++ b/springboot-role/src/main/java/com/tiesheng/role/controller/RoleController.java
@@ -264,8 +264,6 @@ public class RoleController {
     @GetMapping("/owner/menu")
     public ApiResp<String> ownerMenu(@Valid ServiceDTO dto) {
 
-
-
         return ApiResp.respOK("");
     }
 
diff --git a/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java b/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
index a6e52d5..c4ed00b 100644
--- a/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
+++ b/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
@@ -62,10 +62,8 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
      *
      * @return
      */
-    public List<CoreRoleAuthority> getAllOwnerMenus(String userId,String roleId) {
-        List<CoreRoleAuthority> authority = coreRoleUserMapper.getAllAuthorityByUserId(userId, "");
-
-
+    public List<CoreRoleAuthority> getAllOwnerMenus(String userId, String roleId) {
+        List<CoreRoleAuthority> authority = coreRoleUserMapper.getAllAuthorityByUserId(userId, roleId);
 
 
         return authority;
diff --git a/springboot-role/src/main/resources/mapper/CoreRoleUserMapper.xml b/springboot-role/src/main/resources/mapper/CoreRoleUserMapper.xml
index 211abe7..37fc94a 100644
--- a/springboot-role/src/main/resources/mapper/CoreRoleUserMapper.xml
+++ b/springboot-role/src/main/resources/mapper/CoreRoleUserMapper.xml
@@ -35,18 +35,23 @@
   <select id="getAllAuthorityByUserId" resultType="com.tiesheng.role.pojos.dao.CoreRoleAuthority">
       select *
       from core_role_authority
-      where id in (select type_id
-                   from core_role_user
-                   where type = 'menu'
-                     and user_id = #{userId}
+      where is_open = 1
+        and is_deleted = 0
+        and
+      id in (select type_id
+             from core_role_user
+             where type = 'menu'
+               and user_id = #{userId}
+               and is_deleted = 0
 
-                   union
+             union
 
-                   select crgr.menu_id
-                   from core_role_user cru
-                            left join core_role_group_rx crgr on crgr.group_id = cru.type_id
-                   where type = 'job'
-                     and user_id = #{userId}
+             select crgr.menu_id
+             from core_role_user cru
+                      left join core_role_group_rx crgr on crgr.group_id = cru.type_id
+             where type = 'job'
+               and user_id = #{userId}
+               and cru.is_deleted = 0
 
 
       <if test="roleId != null and roleId != ''">
@@ -57,6 +62,7 @@
           where group_id = #{roleId}
       </if>
       )
+      order by sort
   </select>
 
 </mapper>