暂存代码

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

@@ -155,42 +155,24 @@ public class SysMenuController extends BaseController
      *
      * @return 路由信息
      */
-    @GetMapping("getRouters1/{platformId}")
-    public ApiResult getRouters1(@PathVariable("platformId") Integer platformId)
+    @GetMapping("getRouters/{platformId}")
+    public ApiResult getRouters(@PathVariable("platformId") Long platformId)
     {
         Long userId = SecurityUtils.getUserId();
         SysUser sysUser = userService.selectUserByIdOne(userId);
         List<SysMenu> menus = new ArrayList<>();
         if ("01".equals(sysUser.getUserType())){
-            menus = menuService.selectMenuTreeByUserIdOne1(SecurityUtils.getTenantId(),platformId);
+            if (platformId==0){
+                menus = menuService.selectMenuTreeByUserIdOne(SecurityUtils.getTenantId());
+            }else {
+                menus = menuService.selectMenuTreeByUserIdOne1(SecurityUtils.getTenantId(),platformId);
+            }
         }else {
-            menus = menuService.selectMenuTreeByUserId1(userId,platformId);
-        }
-        return ApiResult.success(menuService.buildMenus(menus));
-    }
-
-    /**
-     * 获取路由信息
-     *
-     * @return 路由信息
-     */
-    @GetMapping("getRouters")
-    public ApiResult getRouters()
-    {
-        Long userId = SecurityUtils.getUserId();
-
-//        LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
-//        queryWrapper.eq(SysUser::getDelFlag, 0).eq(SysUser::getStatus,0);
-//        List<SysUser> sysUserList = userService.list(queryWrapper);
-//        if (sysUserList.size()<=0){
-//            throw new BusinessException("用户相关配置未完成配置，请联系管理员");
-//        }
-        SysUser sysUser = userService.selectUserByIdOne(userId);
-        List<SysMenu> menus = new ArrayList<>();
-        if ("01".equals(sysUser.getUserType())){
-            menus = menuService.selectMenuTreeByUserIdOne(SecurityUtils.getTenantId());
-        }else {
-            menus = menuService.selectMenuTreeByUserId(userId);
+            if (platformId==0){
+                menus = menuService.selectMenuTreeByUserId(userId);
+            }else {
+                menus = menuService.selectMenuTreeByUserId1(userId,platformId);
+            }
         }
         return ApiResult.success(menuService.buildMenus(menus));
     }

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

@@ -2,11 +2,13 @@ package com.usky.system.domain;
 
 
 import com.usky.common.core.bean.BaseEntity;
+import com.usky.system.service.vo.PlatformMenuVo;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 
 /**
@@ -51,6 +53,11 @@ public class SysRole extends BaseEntity
     /** 菜单组 */
     private Long[] menuIds;
 
+    /**
+     * 菜单ID
+     */
+    private List<PlatformMenuVo> platformMenuVos;
+
     /** 部门组（数据权限） */
     private Long[] deptIds;
 
@@ -211,6 +218,16 @@ public class SysRole extends BaseEntity
     {
         this.deptIds = deptIds;
     }
+
+    public List<PlatformMenuVo> getPlatformMenuVos()
+    {
+        return platformMenuVos;
+    }
+
+    public void setPlatformMenuVos(List<PlatformMenuVo> platformMenuVos)
+    {
+        this.platformMenuVos = platformMenuVos;
+    }
     
     @Override
     public String toString() {

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

@@ -18,6 +18,9 @@ public class SysRoleMenu
 
     private String menuAliasName;
 
+    /** 应用ID */
+    private Long platformId;
+
     public Long getRoleId()
     {
         return roleId;
@@ -48,12 +51,20 @@ public class SysRoleMenu
         this.menuAliasName = menuAliasName;
     }
 
+    public Long getPlatformId()
+    {
+        return platformId;
+    }
+
+    public void setPlatformId(Long platformId) { this.platformId = platformId; }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
             .append("roleId", getRoleId())
             .append("menuId", getMenuId())
             .append("menuAliasName", getMenuAliasName())
+            .append("platformId", getPlatformId())
             .toString();
     }
 }

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

@@ -46,7 +46,7 @@ public class SysTenantMenu implements Serializable {
     /**
      * 应用ID
      */
-    private Integer platformId;
+    private Long platformId;
 
 
 }

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

@@ -86,11 +86,11 @@ public interface SysMenuMapper extends CrudMapper<SysMenu> {
      * @param platformId 应用ID
      * @return 应用级菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId1(@Param("userId") Long userId,@Param("platformId") Integer platformId);
+    public List<SysMenu> selectMenuTreeByUserId1(@Param("userId") Long userId,@Param("platformId") Long platformId);
 
     public List<SysMenu> selectMenuTreeByUserIdOne(@Param("tenantId") Integer tenantId);
 
-    public List<SysMenu> selectMenuTreeByUserIdOne1(@Param("tenantId") Integer tenantId,@Param("platformId") Integer platformId);
+    public List<SysMenu> selectMenuTreeByUserIdOne1(@Param("tenantId") Integer tenantId,@Param("platformId") Long platformId);
 
     /**
      * 根据角色ID查询菜单树信息

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

@@ -72,11 +72,11 @@ public interface ISysMenuService extends CrudService<SysMenu>
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId1(Long userId,Integer platformId);
+    public List<SysMenu> selectMenuTreeByUserId1(Long userId,Long platformId);
 
     List<SysMenu> selectMenuTreeByUserIdOne(Integer tenantId);
 
-    List<SysMenu> selectMenuTreeByUserIdOne1(Integer tenantId,Integer platformId);
+    List<SysMenu> selectMenuTreeByUserIdOne1(Integer tenantId,Long platformId);
 
     List<SysTenantMenu> selectTenantMenuList(Integer tenantId);
 

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

@@ -4,6 +4,7 @@ import com.usky.common.mybatis.core.CrudService;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysMobileMenu;
 import com.usky.system.domain.SysPlatformMenu;
+import com.usky.system.domain.SysTenantMenu;
 import com.usky.system.service.vo.TenantMenuVo;
 import com.usky.system.service.vo.MobileTenantMenuVO;
 
@@ -24,7 +25,7 @@ public interface SysPlatformMenuService extends CrudService<SysPlatformMenu> {
 
     List<SysMobileMenu> getMobilePlatformMenuList(Integer platformId);
 
-    Long[] selectPlatformMenu(Integer tenantId);
+    List<SysTenantMenu> selectPlatformMenu(Integer tenantId);
 
     Long[] selectMobilePlatformMenu(Integer tenantId);
 

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

@@ -191,7 +191,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId1(Long userId,Integer platformId)
+    public List<SysMenu> selectMenuTreeByUserId1(Long userId,Long platformId)
     {
         List<SysMenu> menus = null;
         if (1L == userId)
@@ -211,7 +211,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
         return getChildPerms(menus, 0);
     }
 
-    public List<SysMenu> selectMenuTreeByUserIdOne1(Integer tenantId,Integer platformId){
+    public List<SysMenu> selectMenuTreeByUserIdOne1(Integer tenantId,Long platformId){
         List<SysMenu> menus = menuMapper.selectMenuTreeByUserIdOne1(tenantId,platformId);
         return getChildPerms(menus, 0);
     }

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

@@ -1,6 +1,7 @@
 package com.usky.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.system.domain.SysMenu;
@@ -47,15 +48,11 @@ public class SysPlatformMenuServiceImpl extends AbstractCrudService<SysPlatformM
         return baseMapper.getMobileMenuList(platformId, null);
     }
 
-    public Long[] selectPlatformMenu(Integer tenantId){
+    public List<SysTenantMenu> selectPlatformMenu(Integer tenantId){
         LambdaQueryWrapper<SysTenantMenu> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(SysTenantMenu::getTenantId, tenantId).orderByAsc(SysTenantMenu::getMenuId);
         List<SysTenantMenu> menuList = sysTenantMenuService.list(queryWrapper);
-        Long[] arr = new Long[menuList.size()];
-        for (int i = 0; i < menuList.size(); i++) {
-            arr[i] = menuList.get(i).getMenuId();
-        }
-        return arr;
+        return menuList;
     }
 
     public Long[] selectMobilePlatformMenu(Integer tenantId){
@@ -196,68 +193,61 @@ public class SysPlatformMenuServiceImpl extends AbstractCrudService<SysPlatformM
     @Transactional
     public void updateMenu(TenantMenuVo tenantMenuVo) {
         List arr3 = new ArrayList();
-        Long[] arr = tenantMenuVo.getMenuIds();
-        //菜单ID
-        List<SysMenu> menuIdList = baseMapper.getMenuIdList(arr, "F");
-        Long arr1[] = new Long[menuIdList.size()];
-        for (int i = 0; i < menuIdList.size(); i++) {
-            arr1[i] = menuIdList.get(i).getParentId();
-        }
-        //目录ID
-        if(arr1.length > 0){
-            List<SysMenu> menuIdListOne = baseMapper.getMenuIdList(arr1, "C");
-            Long arr2[] = new Long[menuIdListOne.size()];
-            for (int i = 0; i < menuIdListOne.size(); i++) {
-                arr2[i] = menuIdListOne.get(i).getParentId();
-            }
-            List<SysMenu> menuIdListTwo = baseMapper.getMenuIdList(arr, "C");
-            Long arr4[] = new Long[menuIdListTwo.size()];
-            for (int i = 0; i < menuIdListTwo.size(); i++) {
-                arr4[i] = menuIdListTwo.get(i).getParentId();
-            }
-            Long[] arr5 = arrayMerge(arr1, arr2);
-            Long[] arr6 = arrayMerge(arr5, arr4);
-            Long[] arr7 = arrayMerge(arr6, arr);
-            for (int i = 0; i < arr7.length; i++) {
-                if (!arr3.contains(arr7[i])) {
-                    arr3.add(arr7[i]);
+        List<PlatformMenuVo> platformMenuVos = tenantMenuVo.getPlatformMenuVos();
+        if (CollectionUtils.isNotEmpty(platformMenuVos)){
+            // 删除租户菜单关联
+            baseMapper.deleteTenantMenuBy(tenantMenuVo.getTenantId());
+            for (int j=0;j<platformMenuVos.size();j++){
+                Long[] arr = platformMenuVos.get(j).getMenuIds();
+                //菜单ID
+                List<SysMenu> menuIdList = baseMapper.getMenuIdList(arr, "F");
+                Long arr1[] = new Long[menuIdList.size()];
+                for (int i = 0; i < menuIdList.size(); i++) {
+                    arr1[i] = menuIdList.get(i).getParentId();
                 }
-            }
-        }else{
-            List<SysMenu> menuIdListTwo = baseMapper.getMenuIdList(arr, "C");
-            Long arr4[] = new Long[menuIdListTwo.size()];
-            for (int i = 0; i < menuIdListTwo.size(); i++) {
-                arr4[i] = menuIdListTwo.get(i).getParentId();
-            }
-            Long[] arr7 = arrayMerge(arr4, arr);
-            for (int i = 0; i < arr7.length; i++) {
-                if (!arr3.contains(arr7[i])) {
-                    arr3.add(arr7[i]);
+                //目录ID
+                if(arr1.length > 0){
+                    List<SysMenu> menuIdListOne = baseMapper.getMenuIdList(arr1, "C");
+                    Long arr2[] = new Long[menuIdListOne.size()];
+                    for (int i = 0; i < menuIdListOne.size(); i++) {
+                        arr2[i] = menuIdListOne.get(i).getParentId();
+                    }
+                    List<SysMenu> menuIdListTwo = baseMapper.getMenuIdList(arr, "C");
+                    Long arr4[] = new Long[menuIdListTwo.size()];
+                    for (int i = 0; i < menuIdListTwo.size(); i++) {
+                        arr4[i] = menuIdListTwo.get(i).getParentId();
+                    }
+                    Long[] arr5 = arrayMerge(arr1, arr2);
+                    Long[] arr6 = arrayMerge(arr5, arr4);
+                    Long[] arr7 = arrayMerge(arr6, arr);
+                    for (int i = 0; i < arr7.length; i++) {
+                        if (!arr3.contains(arr7[i])) {
+                            arr3.add(arr7[i]);
+                        }
+                    }
+                }else{
+                    List<SysMenu> menuIdListTwo = baseMapper.getMenuIdList(arr, "C");
+                    Long arr4[] = new Long[menuIdListTwo.size()];
+                    for (int i = 0; i < menuIdListTwo.size(); i++) {
+                        arr4[i] = menuIdListTwo.get(i).getParentId();
+                    }
+                    Long[] arr7 = arrayMerge(arr4, arr);
+                    for (int i = 0; i < arr7.length; i++) {
+                        if (!arr3.contains(arr7[i])) {
+                            arr3.add(arr7[i]);
+                        }
+                    }
+                }
+                //新增菜单
+                if (arr3.size() > 0) {
+                    for (int i = 0; i < arr3.size(); i++) {
+                        SysTenantMenu sysTenantMenu = new SysTenantMenu();
+                        sysTenantMenu.setMenuId((Long) arr3.get(i));
+                        sysTenantMenu.setTenantId(tenantMenuVo.getTenantId());
+                        sysTenantMenu.setPlatformId(platformMenuVos.get(j).getPlatformId());
+                        sysTenantMenuService.save(sysTenantMenu);
+                    }
                 }
-            }
-        }
-
-//        Long[] arr3 =ifRepeat2(arr6);
-//        Long arr3[] = new Long[arr1.length+arr2.length+arr.length];
-//        for (int i=0;i<arr1.length;i++){
-//            arr3[i] = arr1[i];
-//        }
-//        for (int i=0;i<arr2.length;i++){
-//            arr3[i+arr1.length] = arr2[i];
-//        }
-//        for (int i=0;i<arr.length;i++){
-//            arr3[i+arr1.length+arr2.length] = arr[i];
-//        }
-
-        // 删除租户菜单关联
-        baseMapper.deleteTenantMenuBy(tenantMenuVo.getTenantId());
-        //新增菜单
-        if (arr3.size() > 0) {
-            for (int i = 0; i < arr3.size(); i++) {
-                SysTenantMenu sysTenantMenu = new SysTenantMenu();
-                sysTenantMenu.setMenuId((Long) arr3.get(i));
-                sysTenantMenu.setTenantId(tenantMenuVo.getTenantId());
-                sysTenantMenuService.save(sysTenantMenu);
             }
         }
     }

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

@@ -16,6 +16,7 @@ import com.usky.system.mapper.SysMobileRoleMenuMapper;
 import com.usky.system.mapper.SysUserRoleMapper;
 import com.usky.system.service.ISysRoleService;
 import com.usky.system.service.SysTenantMenuService;
+import com.usky.system.service.vo.PlatformMenuVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -273,33 +274,39 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      */
     public int insertRoleMenu(SysRole role)
     {
+        List<PlatformMenuVo> platformMenuVos = role.getPlatformMenuVos();
         int rows = 1;
         // 新增用户与角色管理
-        List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
-        if (null != role.getMenuIds() && role.getMenuIds().length > 0){
-            LambdaQueryWrapper<SysTenantMenu> queryWrapper = Wrappers.lambdaQuery();
-            queryWrapper.eq(SysTenantMenu::getTenantId,role.getTenantId())
-                    .in(SysTenantMenu::getMenuId,role.getMenuIds());
-            List<SysTenantMenu> list1 = SysTenantMenuService.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(platformMenuVos)){
+            List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
+            for (int j = 0; j < platformMenuVos.size(); j++){
+                if (null != platformMenuVos.get(j).getMenuIds() && platformMenuVos.get(j).getMenuIds().length > 0){
+                    LambdaQueryWrapper<SysTenantMenu> queryWrapper = Wrappers.lambdaQuery();
+                    queryWrapper.eq(SysTenantMenu::getTenantId,role.getTenantId())
+                            .in(SysTenantMenu::getMenuId,platformMenuVos.get(j).getMenuIds());
+                    List<SysTenantMenu> list1 = SysTenantMenuService.list(queryWrapper);
 
-            for (Long menuId : role.getMenuIds())
-            {
-                SysRoleMenu rm = new SysRoleMenu();
-                rm.setRoleId(role.getRoleId());
-                rm.setMenuId(menuId);
-                if(CollectionUtils.isNotEmpty(list1)){
-                    for (int i = 0; i < list1.size(); i++) {
-                        if(menuId.equals(list1.get(i).getMenuId())){
-                            rm.setMenuAliasName(list1.get(i).getMenuAliasName());
+                    for (Long menuId : platformMenuVos.get(j).getMenuIds())
+                    {
+                        SysRoleMenu rm = new SysRoleMenu();
+                        rm.setRoleId(role.getRoleId());
+                        rm.setMenuId(menuId);
+                        rm.setPlatformId(platformMenuVos.get(j).getPlatformId());
+                        if(CollectionUtils.isNotEmpty(list1)){
+                            for (int i = 0; i < list1.size(); i++) {
+                                if(menuId.equals(list1.get(i).getMenuId())){
+                                    rm.setMenuAliasName(list1.get(i).getMenuAliasName());
+                                }
+                            }
                         }
+                        list.add(rm);
                     }
                 }
-                list.add(rm);
             }
-        }
-        if (list.size() > 0)
-        {
-            rows = roleMenuMapper.batchRoleMenu(list);
+            if (list.size() > 0)
+            {
+                rows = roleMenuMapper.batchRoleMenu(list);
+            }
         }
         return rows;
     }

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

@@ -12,10 +12,7 @@ import com.usky.system.service.ISysMenuService;
 import com.usky.system.service.SysPlatformMenuService;
 import com.usky.system.service.SysPlatformService;
 import com.usky.system.service.SysTenantPlatformService;
-import com.usky.system.service.vo.SysPlatformVo;
-import com.usky.system.service.vo.TenantPlatformListVo;
-import com.usky.system.service.vo.TenantPlatformMenuVo;
-import com.usky.system.service.vo.TenantPlatformVo;
+import com.usky.system.service.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -116,14 +113,27 @@ public class SysTenantPlatformServiceImpl extends AbstractCrudService<SysTenantP
         queryWrapper.eq(SysTenantPlatform::getTenantId,tenantId);
         List<SysTenantPlatform> list = this.list(queryWrapper);
         List<TenantPlatformMenuVo> list1 = new ArrayList<>();
-        Long[] arr = sysPlatformMenuService.selectPlatformMenu(tenantId);
+        List<SysTenantMenu> arr = sysPlatformMenuService.selectPlatformMenu(tenantId);
+        List<PlatformMenuVo> platformMenuVos = new ArrayList<>();
         Map<String, Object> ajax = new HashMap<>();
-        ajax.put("checkedKeys",arr);
         if (CollectionUtils.isNotEmpty(list)){
             List<Integer> platformIds = new ArrayList<>();
             for(int j=0;j<list.size();j++){
+                List<Long> menuIds = new ArrayList<>();
                 platformIds.add(list.get(j).getPlatformId());
+                PlatformMenuVo platformMenuVo = new PlatformMenuVo();
+                platformMenuVo.setPlatformId((long) list.get(j).getPlatformId());
+                if (CollectionUtils.isNotEmpty(arr)){
+                    for (int l=0;l<arr.size();l++){
+                        if (arr.get(l).getPlatformId().equals((long)list.get(j).getPlatformId())){
+                            menuIds.add(arr.get(l).getMenuId());
+                        }
+                    }
+                }
+                platformMenuVo.setMenuIds(menuIds.toArray(new Long[0]));
+                platformMenuVos.add(platformMenuVo);
             }
+            ajax.put("checkedKeys",platformMenuVos);
             LambdaQueryWrapper<SysPlatform> queryWrapper1 = Wrappers.lambdaQuery();
             queryWrapper1.in(SysPlatform::getId,platformIds);
             List<SysPlatform> platformList = sysPlatformService.list(queryWrapper1);

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -32,7 +33,7 @@ public class PlatformMenuVo implements Serializable {
     private String platformName;
 
     /**
-     * 平台名称
+     * 图标
      */
     private String icon;
 

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -27,8 +28,8 @@ public class TenantMenuVo implements Serializable {
     private Long tenantId;
 
     /**
-     * 菜单ID
+     * 应用菜单ID
      */
-    private Long[] menuIds;
+    private List<PlatformMenuVo> platformMenuVos;
 
 }

base-modules/service-system/service-system-biz/src/main/resources/bootstrap.yml

@@ -13,10 +13,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
       config:
         # 配置中心地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -227,7 +227,7 @@
                  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
                  left join sys_user u on ur.user_id = u.user_id
-                 left join sys_tenant_menu t on u.tenant_id = t.tenant_id
+                 left join sys_tenant_menu t on m.menu_id = t.menu_id
         where u.user_id = #{userId}
           and m.menu_type in ('M', 'C')
           and m.status = 0