邮箱

muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java

@@ -2,6 +2,7 @@ package com.muyu.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.system.domain.SysMenu;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,6 +22,9 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      */
     public List<SysMenu> selectMenuList (SysMenu menu);
 
+    public List<SysMenu> selectSysMenuList (@Param("longs") List<Long> longs);
+    public List<SysMenu> selectSysChdMenuList (@Param("longs") List<Long> longs);
+
     /**
      * 根据用户所有权限
      *
@@ -135,6 +139,4 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      * @return 结果
      */
     public SysMenu checkMenuNameUnique (@Param("menuName") String menuName, @Param("parentId") Long parentId);
-
-    List<SysMenu> selectSysMenuList(List<Long> longs);
 }

muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java

@@ -61,10 +61,25 @@ public class  SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> imp
             return null;
         }
         List<SysMenu> sysMenus = menuMapper.selectSysMenuList(longs);
+        if (sysMenus != null){
+            sysMenus.addAll(sysMenus);
+        }
+        return sysMenus;
+    }
+
+    public List<SysMenu> selectSysChdMenuList(List<SysMenu> menuList){
+        List<Long> longs = menuList.stream()
+                .map(menu -> menu.getMenuId())
+                .toList();
+        List<SysMenu> sysMenus = menuMapper.selectSysChdMenuList(longs);
+        if (sysMenus!=null && sysMenus.size()!=0){
             List<SysMenu> sysMenus1 = selectSysMenuList(sysMenus);
             if (sysMenus1 != null){
                 sysMenus.addAll(sysMenus1);
             }
+        }else{
+            return null;
+        }
         return sysMenus;
     }
     /**
@@ -80,10 +95,20 @@ public class  SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> imp
         // 管理员显示所有菜单信息
         if (SysUser.isAdmin(userId)) {
             menuList = menuMapper.selectMenuList(menu);
+            List<SysMenu>sysMenus=selectSysMenuList(menuList);
+            if (sysMenus!=null && sysMenus.size()!=0){
+                menuList.addAll(sysMenus);
+            }
+            List<SysMenu> sysMenus1 = selectSysChdMenuList(menuMapper.selectMenuList(menu));            if (sysMenus1 == null) {
+                menuList.addAll(sysMenus1);
+            }
         } else {
             menu.getParams().put("userId", userId);
             menuList = menuMapper.selectMenuListByUserId(menu);
         }
+        menuList = menuList.stream()
+                .distinct()
+                .toList();
         return menuList;
     }
 

muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -185,7 +185,28 @@
         <include refid="selectMenuVo"/>
         where menu_name=#{menuName} and parent_id = #{parentId} limit 1
     </select>
-    <select id="selectSysMenuList" resultType="com.muyu.system.domain.SysMenu"></select>
+    <select id="selectSysMenuList" resultType="com.muyu.system.domain.SysMenu">
+        <include refid="selectMenuVo"/>
+        <where>
+            menu_id in (
+            <foreach collection="longs" separator="," item="id">
+                #{id}
+            </foreach>
+            )
+        </where>
+        order by parent_id, order_num
+    </select>
+    <select id="selectSysChdMenuList" resultType="com.muyu.system.domain.SysMenu">
+        <include refid="selectMenuVo"/>
+        <where>
+            parent_id in (
+            <foreach collection="longs" separator="," item="id">
+                #{id}
+            </foreach>
+            )
+        </where>
+        order by parent_id, order_num
+    </select>
 
     <update id="updateMenu" parameterType="com.muyu.system.domain.SysMenu">
         update sys_menu