路由信息接口更新

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysLoginController.java

@@ -10,6 +10,7 @@ import com.bizmatics.model.vo.RouterVo;
 import com.bizmatics.service.SysTenantConfigService;
 import com.bizmatics.service.config.security.LoginUser;
 import com.bizmatics.service.system.ISysMenuService;
+import com.bizmatics.service.system.ISysUserService;
 import com.bizmatics.service.system.impl.SysLoginService;
 import com.bizmatics.service.system.impl.SysPermissionService;
 import com.bizmatics.service.system.impl.TokenService;
@@ -43,6 +44,9 @@ public class SysLoginController
     @Autowired
     private SysTenantConfigService sysTenantConfigService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 登录方法
      * 
@@ -93,7 +97,13 @@ public class SysLoginController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         // 用户信息
         SysUser user = loginUser.getUser();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
+        List<SysMenu> menus = new ArrayList<>();
+        SysUser sysUser = userService.selectUserById(user.getUserId());
+        if (sysUser.getUserType().equals("01")){
+            menus = menuService.selectMenuTreeBy(sysUser.getTenantId());
+        }else{
+            menus = menuService.selectMenuTreeByUserId(user.getUserId());
+        }
         return ApiResult.success(menuService.buildMenusNew(menus));
     }
 

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysMenuMapper.java

@@ -57,6 +57,8 @@ public interface SysMenuMapper
      */
     public List<SysMenu> selectMenuTreeAll();
 
+    public List<SysMenu> selectMenuTreeAllOne(Integer tenantId);
+
     /**
      * 根据用户ID查询菜单
      *

fiveep-persistence/src/main/resources/mapper/mysql/system/SysMenuMapper.xml

@@ -53,6 +53,12 @@
 		order by m.parent_id, m.order_num
 	</select>
 
+	<select id="selectMenuTreeAllOne" resultMap="SysMenuResult">
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		from sys_menu m ,sys_tenant_menu a where m.menu_type in ('M', 'C') and m.status = 0  and m.menu_id=a.menu_id and a.tenant_id=#{tenantId}
+		order by m.parent_id, m.order_num
+	</select>
+
 	<select id="selectMenuListByUserId" parameterType="com.bizmatics.model.system.SysMenu" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m

fiveep-persistence/src/main/resources/mapper/mysql/system/SysUserMapper.xml

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
         d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.user_type,u.tenant_id
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    left join sys_user_role ur on u.user_id = ur.user_id

fiveep-service/src/main/java/com/bizmatics/service/impl/SysTenantServiceImpl.java

@@ -70,4 +70,8 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
                                                         sysTenantOneVo.getSize());
         return new CommonPage<>(list, total, sysTenantOneVo.getSize(), sysTenantOneVo.getPage());
     }
+
+    public void addTenantData(SysTenant sysTenant){
+        this.updateById(sysTenant);
+    }
 }

fiveep-service/src/main/java/com/bizmatics/service/system/ISysMenuService.java

@@ -47,6 +47,8 @@ public interface ISysMenuService
      */
     public List<SysMenu> selectMenuTreeByUserId(Long userId);
 
+    public List<SysMenu> selectMenuTreeBy(Integer tenantId);
+
     /**
      * 根据角色ID查询菜单树信息
      * 

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysMenuServiceImpl.java

@@ -120,6 +120,16 @@ public class SysMenuServiceImpl implements ISysMenuService {
         return getChildPerms(menus, 0);
     }
 
+    /**
+     * 根据租户ID查询菜单
+     * @param tenantId 租户ID
+     * @return
+     */
+    @Override
+    public List<SysMenu> selectMenuTreeBy(Integer tenantId) {
+        List<SysMenu> menus = menuMapper.selectMenuTreeAllOne(tenantId);
+        return getChildPerms(menus, 0);
+    }
     /**
      * 根据角色ID查询菜单树信息
      *