路由BUG修改

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

@@ -1,6 +1,9 @@
 package com.usky.system.controller.web;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.ServletUtils;
 import com.usky.common.security.service.TokenService;
 import com.usky.common.security.utils.SecurityUtils;
@@ -9,6 +12,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.SysPlatformMenu;
 import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.model.LoginUser;
@@ -158,7 +162,13 @@ public class SysMenuController extends BaseController
     {
         Long userId = SecurityUtils.getUserId();
 
-        SysUser sysUser = userService.selectUserById(userId);
+//        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());

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

@@ -63,7 +63,7 @@ public interface SysMenuMapper extends CrudMapper<SysMenu>
      */
     public List<SysMenu> selectMenuTreeByUserId(Long userId);
 
-    public List<SysMenu> selectMenuTreeByUserIdOne(Integer tenantId);
+    public List<SysMenu> selectMenuTreeByUserIdOne(@Param("tenantId") Integer tenantId);
 
     /**
      * 根据角色ID查询菜单树信息

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -58,6 +58,9 @@ public interface SysUserMapper extends CrudMapper<SysUser>
      */
     public SysUser selectUserById(Long userId);
 
+
+    public SysUser selectUserByIdOne(Long userId);
+
     /**
      * 新增用户信息
      * 

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -53,6 +53,8 @@ public interface ISysUserService extends CrudService<SysUser> {
      */
     public SysUser selectUserById(Long userId);
 
+    public SysUser selectUserByIdOne(Long userId);
+
 
 
     /**

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -114,6 +114,17 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         return userMapper.selectUserById(userId);
     }
 
+    /**
+     * 通过用户ID查询用户
+     *
+     * @param userId 用户ID
+     * @return 用户对象信息
+     */
+    @Override
+    public SysUser selectUserByIdOne(Long userId) {
+        return userMapper.selectUserByIdOne(userId);
+    }
+
 
     /**
      * 查询用户所属角色组

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

@@ -128,7 +128,7 @@
         order by m.parent_id, m.order_num
     </select>
 
-    <select id="selectMenuTreeByUserIdOne" parameterType="Long" resultMap="SysMenuResult">
+    <select id="selectMenuTreeByUserIdOne" resultMap="SysMenuResult">
         SELECT
             m.menu_id,
             m.parent_id,

service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -140,6 +140,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
+
+	<select id="selectUserByIdOne" parameterType="Long" resultMap="SysUserResult">
+		select * from sys_user as u
+		where u.user_id = #{userId}
+	</select>
 	
 	<select id="checkUserNameUnique" resultType="int">
 		select count(1) from sys_user where user_name = #{userName} and del_flag != '2'