Commit c18509944fb8967181ff69af9111ec741eaac125
Committed by
Gitee
Gitee
!974 获取不到用户引发的NPE异常
Merge pull request !974 from g_l/N/A
Showing
1 changed file
with
1 additions
and
0 deletions
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
| @@ -119,6 +119,7 @@ public class UserController { | @@ -119,6 +119,7 @@ public class UserController { | ||
| 119 | @PreAuthorize("@ss.hasPermission('system:user:query')") | 119 | @PreAuthorize("@ss.hasPermission('system:user:query')") |
| 120 | public CommonResult<UserRespVO> getUser(@RequestParam("id") Long id) { | 120 | public CommonResult<UserRespVO> getUser(@RequestParam("id") Long id) { |
| 121 | AdminUserDO user = userService.getUser(id); | 121 | AdminUserDO user = userService.getUser(id); |
| 122 | + if (ObjectUtil.isEmpty(user)) return CommonResult.success(null); | ||
| 122 | // 拼接数据 | 123 | // 拼接数据 |
| 123 | DeptDO dept = deptService.getDept(user.getDeptId()); | 124 | DeptDO dept = deptService.getDept(user.getDeptId()); |
| 124 | return success(UserConvert.INSTANCE.convert(user, dept)); | 125 | return success(UserConvert.INSTANCE.convert(user, dept)); |