'开发pc端和移动端增加菜单昵称展示和编辑相关接口'

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

@@ -9,6 +9,7 @@ import com.usky.common.core.constants.CommonConst;
 import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.common.core.util.StringUtils;
 import com.usky.system.domain.SysMenu;
+import com.usky.system.domain.SysTenantMenu;
 import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.model.LoginUser;
@@ -174,4 +175,27 @@ public class SysMenuController extends BaseController
         }
         return ApiResult.success(menuService.buildMenus(menus));
     }
+
+    /**
+     * 获取租户菜单关联信息列表
+     */
+    @GetMapping("/getTenantMenuList")
+    public ApiResult getTenantMenuList()
+    {
+        List<SysTenantMenu> menus = menuService.selectTenantMenuList(SecurityUtils.getTenantId());
+
+        return ApiResult.success(menus);
+    }
+
+    /**
+     * 修改菜单昵称
+     * @param tenantMenu
+     * @return
+     */
+    @PutMapping("/updateTenantMenu")
+    public ApiResult<Void> updateTenantMenu(@RequestBody SysTenantMenu tenantMenu)
+    {
+        menuService.updateTenantMenu(tenantMenu);
+        return ApiResult.success();
+    }
 }

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

@@ -8,9 +8,7 @@ import com.usky.common.core.util.ServletUtils;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.security.service.TokenService;
 import com.usky.common.security.utils.SecurityUtils;
-import com.usky.system.domain.SysMenu;
-import com.usky.system.domain.SysMobileMenu;
-import com.usky.system.domain.SysUser;
+import com.usky.system.domain.*;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.model.LoginUser;
 import com.usky.system.service.ISysUserService;
@@ -69,6 +67,29 @@ public class SysMobileMenuController  extends BaseController {
         return ApiResult.success(sysMobileMenuService.buildMenus(menus));
     }
 
+    /**
+     * 获取移动端租户菜单关联信息列表
+     */
+    @GetMapping("/getMobileTenantMenuList")
+    public ApiResult getMobileTenantMenuList()
+    {
+        List<SysMobileTenantMenu> menus = sysMobileMenuService.getMobileTenantMenuList(SecurityUtils.getTenantId());
+
+        return ApiResult.success(menus);
+    }
+
+    /**
+     * 修改移动端菜单昵称
+     * @param mobileTenantMenu
+     * @return
+     */
+    @PutMapping("/updateMobileTenantMenu")
+    public ApiResult<Void> updateMobileTenantMenu(@RequestBody SysMobileTenantMenu mobileTenantMenu)
+    {
+        sysMobileMenuService.updateMobileTenantMenu(mobileTenantMenu);
+        return ApiResult.success();
+    }
+
     /**
      * 移动端系统管理-菜单管理-列表展示
      */

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

@@ -26,6 +26,12 @@ public class SysMenu extends BaseEntity
     /** 菜单名称 */
     private String menuName;
 
+    /**
+     * 菜单昵称
+     */
+    @TableField(exist = false)
+    private String menuAliasName;
+
     /** 父菜单名称 */
     @TableField(exist = false)
     private String parentName;
@@ -89,6 +95,16 @@ public class SysMenu extends BaseEntity
         this.menuName = menuName;
     }
 
+    public String getMenuAliasName()
+    {
+        return menuAliasName;
+    }
+
+    public void setMenuAliasName(String menuAliasName)
+    {
+        this.menuAliasName = menuAliasName;
+    }
+
     public String getParentName()
     {
         return parentName;

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

@@ -32,6 +32,12 @@ public class SysMobileMenu extends BaseEntity {
      */
     private String menuName;
 
+    /**
+     * 菜单昵称
+     */
+    @TableField(exist = false)
+    private String menuAliasName;
+
     /** 父菜单名称 */
     @TableField(exist = false)
     private String parentName;
@@ -124,6 +130,16 @@ public class SysMobileMenu extends BaseEntity {
         this.menuName = menuName;
     }
 
+    public String getMenuAliasName()
+    {
+        return menuAliasName;
+    }
+
+    public void setMenuAliasName(String menuAliasName)
+    {
+        this.menuAliasName = menuAliasName;
+    }
+
     public String getParentName()
     {
         return parentName;

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

@@ -30,6 +30,8 @@ public class SysMobileTenantMenu implements Serializable {
      */
     private Long menuId;
 
+    private String menuName;
+
     private String menuAliasName;
 
 

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

@@ -31,6 +31,8 @@ public class SysTenantMenu implements Serializable {
      */
     private Long menuId;
 
+    private String menuName;
+
     private String menuAliasName;
 
 

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

@@ -3,6 +3,7 @@ package com.usky.system.mapper;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysMobileMenu;
 import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.system.domain.SysMobileTenantMenu;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -50,6 +51,7 @@ public interface SysMobileMenuMapper extends CrudMapper<SysMobileMenu> {
      */
     public List<SysMobileMenu> selectMenuTreeByUserIdOne(@Param("tenantId") Integer tenantId);
 
+
     /**
      * 根据角色ID查询菜单树信息
      *

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

@@ -2,6 +2,10 @@ package com.usky.system.mapper;
 
 import com.usky.system.domain.SysMobileTenantMenu;
 import com.usky.common.mybatis.core.CrudMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +15,8 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @author JCB
  * @since 2022-08-11
  */
+@Repository
 public interface SysMobileTenantMenuMapper extends CrudMapper<SysMobileTenantMenu> {
 
+    public List<SysMobileTenantMenu> getMobileTenantMenuList(@Param("tenantId") Integer tenantId);
 }

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

@@ -2,6 +2,10 @@ package com.usky.system.mapper;
 
 import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.system.domain.SysTenantMenu;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +15,9 @@ import com.usky.system.domain.SysTenantMenu;
  * @author ya
  * @since 2022-05-18
  */
+@Repository
 public interface SysTenantMenuMapper extends CrudMapper<SysTenantMenu> {
 
+
+    public List<SysTenantMenu> selectTenantMenuList(@Param("tenantId") Integer tenantId);
 }

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

@@ -4,9 +4,11 @@ package com.usky.system.service;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysMobileMenu;
+import com.usky.system.domain.SysTenantMenu;
 import com.usky.system.service.vo.RouterVo;
 import com.usky.system.service.vo.TreeMobileSelect;
 import com.usky.system.service.vo.TreeSelect;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Set;
@@ -66,6 +68,10 @@ public interface ISysMenuService extends CrudService<SysMenu>
 
     List<SysMenu> selectMenuTreeByUserIdOne(Integer tenantId);
 
+    List<SysTenantMenu> selectTenantMenuList(Integer tenantId);
+
+    void updateTenantMenu(SysTenantMenu tenantMenu);
+
     /**
      * 根据角色ID查询菜单树信息
      * 

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

@@ -3,6 +3,8 @@ package com.usky.system.service;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysMobileMenu;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.system.domain.SysMobileTenantMenu;
+import com.usky.system.domain.SysTenantMenu;
 import com.usky.system.service.vo.RouterVo;
 import com.usky.system.service.vo.TreeMobileSelect;
 
@@ -40,6 +42,11 @@ public interface SysMobileMenuService extends CrudService<SysMobileMenu> {
      */
     List<SysMobileMenu> selectMenuTreeByUserIdOne(Integer tenantId);
 
+
+    List<SysMobileTenantMenu> getMobileTenantMenuList(Integer tenantId);
+
+    void updateMobileTenantMenu(SysMobileTenantMenu mobileTenantMenu);
+
     /**
      * 根据角色ID查询菜单树信息
      *

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

@@ -1,18 +1,19 @@
 package com.usky.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.SysMobileMenu;
-import com.usky.system.domain.SysRole;
-import com.usky.system.domain.SysUserVO;
+import com.usky.system.domain.*;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysMenuMapper;
 import com.usky.system.mapper.SysRoleMapper;
 import com.usky.system.mapper.SysRoleMenuMapper;
+import com.usky.system.mapper.SysTenantMenuMapper;
 import com.usky.system.service.ISysMenuService;
+import com.usky.system.service.SysTenantMenuService;
 import com.usky.system.service.vo.MetaVo;
 import com.usky.system.service.vo.RouterVo;
 import com.usky.system.service.vo.TreeSelect;
@@ -37,6 +38,12 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
     @Autowired
     private SysMenuMapper menuMapper;
 
+    @Autowired
+    private SysTenantMenuMapper tenantMenuMapper;
+
+    @Autowired
+    private SysTenantMenuService tenantMenuService;
+
     @Autowired
     private SysRoleMapper roleMapper;
 
@@ -171,6 +178,12 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
         return getChildPerms(menus, 0);
     }
 
+    @Override
+    public List<SysTenantMenu> selectTenantMenuList(Integer tenantId){
+        List<SysTenantMenu> menus = tenantMenuMapper.selectTenantMenuList(tenantId);
+        return menus;
+    }
+
     /**
      * 根据角色ID查询菜单树信息
      *
@@ -201,7 +214,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
             router.setName(getRouteName(menu));
             router.setPath(getRouterPath(menu));
             router.setComponent(getComponent(menu));
-            router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+            router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
             List<SysMenu> cMenus = menu.getChildren();
             if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
             {
@@ -217,13 +230,13 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
                 children.setPath(menu.getPath());
                 children.setComponent(menu.getComponent());
                 children.setName(StringUtils.capitalize(menu.getPath()));
-                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
                 childrenList.add(children);
                 router.setChildren(childrenList);
             }
             else if (menu.getParentId().intValue() == 0 && isInnerLink(menu))
             {
-                router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
+                router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon()));
                 router.setPath("/inner");
                 List<RouterVo> childrenList = new ArrayList<RouterVo>();
                 RouterVo children = new RouterVo();
@@ -231,7 +244,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
                 children.setPath(routerPath);
                 children.setComponent(UserConstants.INNER_LINK);
                 children.setName(StringUtils.capitalize(routerPath));
-                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath()));
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), menu.getPath()));
                 childrenList.add(children);
                 router.setChildren(childrenList);
             }
@@ -392,6 +405,15 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
         return menuMapper.updateMenu(menu);
     }
 
+    @Override
+    public void updateTenantMenu(SysTenantMenu tenantMenu){
+        UpdateWrapper<SysTenantMenu> updateWrapper = Wrappers.update();
+        updateWrapper.set("menu_alias_name",tenantMenu.getMenuAliasName())
+                .eq("tenant_id",tenantMenu.getTenantId())
+                .eq("menu_id",tenantMenu.getMenuId());
+        tenantMenuService.update(updateWrapper);
+    }
+
     /**
      * 删除菜单管理信息
      *

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

@@ -1,6 +1,7 @@
 package com.usky.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.constants.Constants;
@@ -10,6 +11,7 @@ import com.usky.system.controller.web.SysMenuController;
 import com.usky.system.domain.*;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysMobileMenuMapper;
+import com.usky.system.mapper.SysMobileTenantMenuMapper;
 import com.usky.system.mapper.SysRoleMapper;
 import com.usky.system.mapper.SysRoleMenuMapper;
 import com.usky.system.service.SysMobileMenuService;
@@ -40,13 +42,16 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
     private SysMobileMenuMapper sysMobileMenuMapper;
 
     @Autowired
-    private SysRoleMenuMapper sysRoleMenuMapper;
+    private  SysMobileTenantMenuMapper sysMobileTenantMenuMapper;
 
     @Autowired
-    private SysRoleMapper roleMapper;
+    private SysMobileTenantMenuService sysMobileTenantMenuService;
 
     @Autowired
-    private SysMobileTenantMenuService sysMobileTenantMenuService;
+    private SysRoleMenuMapper sysRoleMenuMapper;
+
+    @Autowired
+    private SysRoleMapper roleMapper;
 
     /**
      * 查询系统菜单列表
@@ -239,6 +244,21 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
         return getChildPerms(menus, 0);
     }
 
+    @Override
+    public List<SysMobileTenantMenu> getMobileTenantMenuList(Integer tenantId){
+        List<SysMobileTenantMenu> menus = sysMobileTenantMenuMapper.getMobileTenantMenuList(tenantId);
+        return menus;
+    }
+
+    @Override
+    public void updateMobileTenantMenu(SysMobileTenantMenu mobileTenantMenu){
+        UpdateWrapper<SysMobileTenantMenu> updateWrapper = Wrappers.update();
+        updateWrapper.set("menu_alias_name",mobileTenantMenu.getMenuAliasName())
+                .eq("tenant_id",mobileTenantMenu.getTenantId())
+                .eq("menu_id",mobileTenantMenu.getMenuId());
+        sysMobileTenantMenuService.update(updateWrapper);
+    }
+
     /**
      * 根据角色ID查询菜单树信息
      *
@@ -269,7 +289,7 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
             router.setName(getRouteName(menu));
             router.setPath(getRouterPath(menu));
             router.setComponent(getComponent(menu));
-            router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+            router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
             List<SysMobileMenu> cMenus = menu.getChildren();
             if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
             {
@@ -285,13 +305,13 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
                 children.setPath(menu.getPath());
                 children.setComponent(menu.getComponent());
                 children.setName(StringUtils.capitalize(menu.getPath()));
-                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
                 childrenList.add(children);
                 router.setChildren(childrenList);
             }
             else if (menu.getParentId().intValue() == 0 && isInnerLink(menu))
             {
-                router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
+                router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon()));
                 router.setPath("/inner");
                 List<RouterVo> childrenList = new ArrayList<RouterVo>();
                 RouterVo children = new RouterVo();
@@ -299,7 +319,7 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
                 children.setPath(routerPath);
                 children.setComponent(UserConstants.INNER_LINK);
                 children.setName(StringUtils.capitalize(routerPath));
-                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath()));
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), menu.getPath()));
                 childrenList.add(children);
                 router.setChildren(childrenList);
             }

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

@@ -17,6 +17,11 @@ public class MetaVo
      */
     private String title;
 
+    /**
+     * 菜单昵称
+     */
+    private String aliasTitle;
+
     /**
      * 设置该路由的图标，对应路径src/assets/icons/svg
      */
@@ -31,27 +36,31 @@ public class MetaVo
     {
     }
 
-    public MetaVo(String title, String icon)
+    public MetaVo(String title, String aliasTitle, String icon)
     {
         this.title = title;
+        this.aliasTitle = aliasTitle;
         this.icon = icon;
     }
 
-    public MetaVo(String title, String icon, boolean noCache)
+    public MetaVo(String title, String aliasTitle, String icon, boolean noCache)
     {
         this.title = title;
+        this.aliasTitle = aliasTitle;
         this.icon = icon;
     }
 
-    public MetaVo(String title, String icon, String link)
+    public MetaVo(String title, String aliasTitle, String icon, String link)
     {
         this.title = title;
+        this.aliasTitle = aliasTitle;
         this.icon = icon;
     }
 
-    public MetaVo(String title, String icon, boolean noCache, String link)
+    public MetaVo(String title, String aliasTitle, String icon, boolean noCache, String link)
     {
         this.title = title;
+        this.aliasTitle = aliasTitle;
         this.icon = icon;
         if (StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS))
         {
@@ -70,6 +79,16 @@ public class MetaVo
         this.title = title;
     }
 
+    public String getAliasTitle()
+    {
+        return aliasTitle;
+    }
+
+    public void setAliasTitle(String aliasTitle)
+    {
+        this.aliasTitle = aliasTitle;
+    }
+
     public String getIcon()
     {
         return icon;

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

@@ -7,6 +7,7 @@
     <resultMap type="com.usky.system.domain.SysMenu" id="SysMenuResult">
         <id property="menuId" column="menu_id"/>
         <result property="menuName" column="menu_name"/>
+        <result property="menuAliasName" column="menu_alias_name"/>
         <result property="parentName" column="parent_name"/>
         <result property="parentId" column="parent_id"/>
         <result property="orderNum" column="order_num"/>
@@ -200,6 +201,7 @@
             m.menu_id,
             m.parent_id,
             m.menu_name,
+            t.menu_alias_name,
             m.path,
             m.component,
             m.visible,

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

@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.usky.system.domain.SysMobileMenu">
         <id column="menu_id" property="menuId" />
         <result column="menu_name" property="menuName" />
+        <result property="menuAliasName" column="menu_alias_name"/>
         <result column="parent_id" property="parentId" />
         <result column="order_num" property="orderNum" />
         <result column="path" property="path" />
@@ -142,6 +143,7 @@
             m.menu_id,
             m.parent_id,
             m.menu_name,
+            t.menu_alias_name,
             m.path,
             m.component,
             m.visible,

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

@@ -6,7 +6,27 @@
     <resultMap id="BaseResultMap" type="com.usky.system.domain.SysMobileTenantMenu">
         <id column="tenant_id" property="tenantId" />
         <result column="menu_id" property="menuId" />
+        <result property="menuName" column="menu_name"/>
         <result column="menu_alias_name" property="menuAliasName" />
     </resultMap>
 
+    <select id="getMobileTenantMenuList" resultMap="BaseResultMap">
+        SELECT
+            t.tenant_id,
+            t.menu_id,
+            m.menu_name,
+	        t.menu_alias_name
+        FROM
+            sys_mobile_menu m
+                JOIN sys_mobile_tenant_menu t
+        WHERE
+            m.menu_id = t.menu_id
+          AND m.menu_type IN ('M', 'C')
+          AND m. STATUS = 0
+          AND t.tenant_id=#{tenantId}
+        ORDER BY
+            t.tenant_id,
+            t.menu_id
+    </select>
+
 </mapper>

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

@@ -6,7 +6,27 @@
     <resultMap id="BaseResultMap" type="com.usky.system.domain.SysTenantMenu">
         <id column="tenant_id" property="tenantId" />
         <result column="menu_id" property="menuId" />
+        <result property="menuName" column="menu_name"/>
         <result column="menu_alias_name" property="menuAliasName" />
     </resultMap>
 
+    <select id="selectTenantMenuList" resultMap="BaseResultMap">
+        SELECT
+            t.tenant_id,
+            t.menu_id,
+            m.menu_name,
+	        t.menu_alias_name
+        FROM
+            sys_menu m
+                JOIN sys_tenant_menu t
+        WHERE
+            m.menu_id = t.menu_id
+          AND m.menu_type IN ('M', 'C')
+          AND m. STATUS = 0
+          AND t.tenant_id=#{tenantId}
+        ORDER BY
+            t.tenant_id,
+            t.menu_id
+    </select>
+
 </mapper>