|
@@ -119,7 +119,9 @@ public class UserController {
|
|
|
@PreAuthorize("@ss.hasPermission('system:user:query')")
|
|
|
public CommonResult<UserRespVO> getUser(@RequestParam("id") Long id) {
|
|
|
AdminUserDO user = userService.getUser(id);
|
|
|
- if (ObjectUtil.isEmpty(user)) return CommonResult.success(null);
|
|
|
+ if (user == null) {
|
|
|
+ return success(null);
|
|
|
+ }
|
|
|
// 拼接数据
|
|
|
DeptDO dept = deptService.getDept(user.getDeptId());
|
|
|
return success(UserConvert.INSTANCE.convert(user, dept));
|