From 0ee8eb2c10134ea1ce9f01d73fb1a99438b694d8 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Thu, 3 Aug 2023 11:22:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/mapper/xml/BaseActionMapper.xml      |  8 +++-----
 .../service/impl/BaseActionServiceImpl.java        |  2 +-
 .../service/impl/BaseMenuServiceImpl.java          | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseActionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseActionMapper.xml
index 2a7bd04..8d5c138 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseActionMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseActionMapper.xml
@@ -40,15 +40,13 @@
     </select>
 
     <select id="getActionCodes" resultType="com.zhgd.xmgl.modules.basicdata.entity.BaseAction">
-        SELECT * FROM base_action WHERE status = 1 AND EXISTS(
-            SELECT * FROM base_menu WHERE EXISTS(
+        SELECT * FROM base_action WHERE status = 1 AND menu_id IN (
+            SELECT menu_id FROM base_menu WHERE module_id IN (
                 SELECT module_id FROM base_module WHERE module_type = #{accountType}))
     </select>
 
     <select id="getActionCodeByRole" resultType="com.zhgd.xmgl.modules.basicdata.entity.BaseAction">
-        SELECT * FROM base_action WHERE status = 1 AND EXISTS(
-            SELECT * FROM base_menu WHERE EXISTS(
-                SELECT menu_id FROM system_role_menu WHERE role_id = #{roleId}))
+        SELECT * FROM base_action WHERE status = 1 AND action_id IN (SELECT authority_id FROM system_role_menu WHERE role_id = #{roleId} AND type = 2 )
     </select>
 
     <select id="getMenuCode" resultType="java.lang.String">
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseActionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseActionServiceImpl.java
index ec47c8e..47af86b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseActionServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseActionServiceImpl.java
@@ -57,7 +57,7 @@ public class BaseActionServiceImpl extends ServiceImpl<BaseActionMapper, BaseAct
     public Set<String> queryBySelf(Long menuId) {
         SecurityUser user = SecurityUtil.getUser();
         Set<String> actionCodes = new HashSet<>();
-        if (user.isManager()) {
+        if (user.isManager() && user.getAccountType() != 3) {
             actionCodes = baseActionMapper.getActionCodes(user.getAccountType()).stream().filter(a -> a.getMenuId().equals(menuId))
                     .map(a -> a.getActionCode()).collect(Collectors.toSet());
         } else {
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
index 71316b2..9e245d2 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
@@ -166,8 +166,18 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
         if (systemUser == null) {
             throw new CustomException("用户不存在");
         }
-        List<BaseMenu> baseMenus = baseMenuMapper.selectList(Wrappers.<BaseMenu>lambdaQuery().in(BaseMenu::getModuleId, moduleId)
-                .eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority));
+        List<BaseMenu> baseMenus = new ArrayList<>();
+        if (systemUser.getIsManager() && systemUser.getAccountType() != 3) {
+            // 查询相对应的菜单
+            baseMenus = baseMenuMapper.selectList(Wrappers.<BaseMenu>lambdaQuery().in(BaseMenu::getModuleId, moduleId)
+                    .eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority));
+        } else {
+            Long roleId = systemUserRoleService.getOne(Wrappers.<SystemUserRole>lambdaQuery()
+                    .eq(SystemUserRole::getUserId, systemUser.getUserId())).getRoleId();
+            if (roleId != null) {
+                baseMenus = baseMenuMapper.getMenuIdByFilter(roleId, moduleId);
+            }
+        }
         return TreeUtil.formatHz(baseMenus);
     }