From 1789718f58e3374ce85357524ef80a84f3d70d6f Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 25 六月 2023 18:36:01 +0800
Subject: [PATCH] 商户端统计

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 58 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java
index 71abcfe..fd8a9d1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java
@@ -50,7 +50,16 @@
     {
         return selectMenuList(new SysMenu(), userId);
     }
-
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    @Override
+    public List<SysMenu> selectStaffMenuList(Long userId){
+        return selectStaffMenuList(new SysMenu(), userId);
+    }
     /**
      * 查询系统菜单列表
      * 
@@ -70,6 +79,29 @@
         {
             menu.getParams().put("userId", userId);
             menuList = menuMapper.selectMenuListByUserId(menu);
+        }
+        return menuList;
+    }
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param menu 菜单信息
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    @Override
+    public List<SysMenu> selectStaffMenuList(SysMenu menu, Long userId){
+        List<SysMenu> menuList = null;
+        // 管理员显示所有菜单信息
+        if (SysUser.isAdmin(userId))
+        {
+            menuList = menuMapper.selectStaffMenuList(menu);
+        }
+        else
+        {
+            menu.getParams().put("userId", userId);
+            menuList = menuMapper.selectStaffMenuListByUserId(menu);
         }
         return menuList;
     }
@@ -164,16 +196,41 @@
 
     /**
      * @description selectMenuListByDeptId
+     * @param deptId
+     * @return List<SysMenu>
+     * @author jqs34
+     * @date 2023/6/18 19:13
+     */
+    @Override
+    public List<Long> selectStaffMenuListByDeptId(Long deptId){
+        return menuMapper.selectStaffMenuListByDeptId(deptId, true);
+    }
+
+    /**
+     * @description selectMenuListByDeptId
      * @param deptUserId
      * @return List<SysMenu>
      * @author jqs34
      * @date 2023/6/18 19:13
      */
+    @Override
     public List<Long> selectMenuListByDeptUserId(Long deptUserId){
         return menuMapper.selectMenuListByDeptUserId(deptUserId, true);
     }
 
     /**
+     * @description selectMenuListByDeptId
+     * @param deptUserId
+     * @return List<SysMenu>
+     * @author jqs34
+     * @date 2023/6/18 19:13
+     */
+    @Override
+    public List<Long> selectStaffMenuListByDeptUserId(Long deptUserId){
+        return menuMapper.selectStaffMenuListByDeptUserId(deptUserId, true);
+    }
+
+    /**
      * 构建前端路由所需要的菜单
      * 
      * @param menus 菜单列表

--
Gitblit v1.7.1