角色管理-新增-菜单查询bug修复

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysMenuController.java

@@ -69,8 +69,8 @@ public class SysMenuController extends BaseController
     @GetMapping("/treeselect")
     public ApiResult treeselect(SysMenu menu)
     {
-        Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+//        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuListTwo(menu);
         return ApiResult.success(menuService.buildMenuTreeSelect(menus));
     }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysMenuMapper.java

@@ -15,8 +15,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysMenuMapper extends CrudMapper<SysMenu>
-{
+public interface SysMenuMapper extends CrudMapper<SysMenu> {
     /**
      * 查询系统菜单列表
      *
@@ -25,6 +24,16 @@ public interface SysMenuMapper extends CrudMapper<SysMenu>
      */
     public List<SysMenu> selectMenuList(SysMenu menu);
 
+    /**
+     * 根据租户查询系统菜单
+     *
+     * @param tenantId 租户ID
+     * @param menuName 目录名册
+     * @return
+     */
+    public List<SysMenu> selectMenuListOne(@Param("tenantId") Integer tenantId,
+                                           @Param("menuName") String menuName);
+
     /**
      * 根据用户所有权限
      *
@@ -71,8 +80,8 @@ public interface SysMenuMapper extends CrudMapper<SysMenu>
 
     /**
      * 根据角色ID查询菜单树信息
-     * 
-     * @param roleId 角色ID
+     *
+     * @param roleId            角色ID
      * @param menuCheckStrictly 菜单树选择项是否关联显示
      * @return 选中菜单列表
      */

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysMenuService.java

@@ -33,6 +33,12 @@ public interface ISysMenuService extends CrudService<SysMenu>
      */
     public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
 
+    /**
+     * 根据租户查询目录
+     * @param menu
+     * @return
+     */
+    List<SysMenu> selectMenuListTwo(SysMenu menu);
 
     List<SysMenu> selectMenuListOne(Long userId);
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMenuServiceImpl.java

@@ -3,6 +3,7 @@ package com.usky.system.service.impl;
 import com.usky.common.core.constants.Constants;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUserVO;
@@ -75,6 +76,13 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
         return menuList;
     }
 
+    @Override
+    public List<SysMenu> selectMenuListTwo(SysMenu menu)
+    {
+        List<SysMenu> menuList = menuMapper.selectMenuListOne(SecurityUtils.getTenantId(),menu.getMenuName());
+        return menuList;
+    }
+
 
     @Override
     public List<SysMenu> selectMenuListOne(Long userId)

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -60,6 +60,36 @@
         order by parent_id, order_num
     </select>
 
+    <select id="selectMenuListOne" resultType="com.usky.system.domain.SysMenu">
+        SELECT
+        b.menu_id,
+        b.menu_name,
+        b.parent_id,
+        b.order_num,
+        b.path,
+        b.component,
+        b.is_frame,
+        b.is_cache,
+        b.menu_type,
+        b.visible,
+        b.status,
+        ifnull(b.perms, '') as perms,
+        b.icon,
+        b.create_time
+        FROM
+        sys_tenant_menu AS a
+        JOIN sys_menu AS b ON a.menu_id = b.menu_id
+        <where>
+            a.tenant_id = #{tenantId}
+            <if test="menuName != null and menuName != ''">
+                AND b.menu_name like concat('%', #{menuName}, '%')
+            </if>
+            AND b.visible = 0
+            AND b.status = 0
+        </where>
+        order by parent_id, order_num
+    </select>
+
     <select id="selectMenuTreeAll" resultMap="SysMenuResult">
         select distinct m.menu_id,
                         m.parent_id,