租户菜单修改

fs-service/src/main/java/com/fs/tenant/service/impl/TenantInfoServiceImpl.java

@@ -281,17 +281,18 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
 
     @Override
     public List<SysMenu> selectMenuList(SysMenu menu, Long userId) {
-        List<SysMenu> menuList = null;
-        // 管理员显示所有菜单信息
-        if (SysUser.isAdmin(userId))
-        {
-            menuList = baseMapper.selectMenuList(menu);
-        }
-        else
-        {
-            menu.getParams().put("userId", userId);
-            menuList = baseMapper.selectMenuListByUserId(menu);
-        }
+        List<SysMenu> menuList = baseMapper.selectMenuList(menu);
+
+//        // 管理员显示所有菜单信息
+//        if (SysUser.isAdmin(userId))
+//        {
+//
+//        }
+//        else
+//        {
+//            menu.getParams().put("userId", userId);
+//            menuList = baseMapper.selectMenuListByUserId(menu);
+//        }
         return menuList;
     }
 
@@ -340,17 +341,17 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
 
     @Override
     public List<CompanyMenu> selectCompanyMenuList(CompanyMenu menu, Long userId) {
-        List<CompanyMenu> menuList = null;
+        List<CompanyMenu> menuList = baseMapper.selectCompanyMenuList(menu);
         // 管理员显示所有菜单信息
-        if (SysUser.isAdmin(userId))
-        {
-            menuList = baseMapper.selectCompanyMenuList(menu);
-        }
-        else
-        {
-            menu.getParams().put("userId", userId);
-            menuList = baseMapper.selectCompanyMenuList(menu);
-        }
+//        if (SysUser.isAdmin(userId))
+//        {
+//            menuList = baseMapper.selectCompanyMenuList(menu);
+//        }
+//        else
+//        {
+//            menu.getParams().put("userId", userId);
+//            menuList = baseMapper.selectCompanyMenuList(menu);
+//        }
         return menuList;
     }
 

fs-service/src/main/resources/mapper/tenant/TenantInfoMapper.xml

@@ -102,7 +102,7 @@
         left join sys_role_menu rm on m.menu_id = rm.menu_id
         left join sys_user_role ur on rm.role_id = ur.role_id
         left join sys_role ro on ur.role_id = ro.role_id
-        where ur.user_id = #{params.userId}
+        where
         <if test="menuName != null and menuName != ''">
             AND m.menu_name like concat('%', #{menuName}, '%')
         </if>