提交 e9740f9c 编写于 作者: 总有刁民想害朕2's avatar 总有刁民想害朕2

feat(修复登录用户不存在时空指针异常): youlai-system

修复登录用户不存在时空指针异常
上级 08b63503
......@@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.youlai.common.result.ResultCode;
import com.youlai.system.dto.UserAuthInfo;
import com.youlai.system.pojo.dto.UserImportDTO;
import com.youlai.system.pojo.entity.SysUser;
......@@ -21,6 +22,7 @@ import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.simpleframework.xml.core.Validate;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.StopWatch;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
......@@ -49,7 +51,11 @@ public class SysUserController {
@ApiOperation(value = "用户分页列表")
@GetMapping("/pages")
public PageResult<UserVO> listUserPages(UserPageQuery queryParams) {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
IPage<UserVO> result = userService.listUserPages(queryParams);
stopWatch.stop();
System.out.println("耗时:" + stopWatch.getTotalTimeMillis());
return PageResult.success(result);
}
......@@ -164,6 +170,10 @@ public class SysUserController {
@ApiParam("用户名") @PathVariable String username
) {
UserAuthInfo user = userService.getUserAuthInfo(username);
return Result.success(user);
if(user==null){
return Result.failed(ResultCode.USER_NOT_EXIST);
}else{
return Result.success(user);
}
}
}
......@@ -210,7 +210,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public UserAuthInfo getUserAuthInfo(String username) {
UserAuthInfo userAuthInfo = this.baseMapper.getUserAuthInfo(username);
if (userAuthInfo == null) {
return null;
}
Set<String> roles = userAuthInfo.getRoles();
if (CollectionUtil.isNotEmpty(roles)) {
Set<String> perms = menuService.listRolePerms(roles);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册