From 4466eb1bcdec54bdccb29f683016969791b3fb06 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 18 May 2024 20:28:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91SYSTEM?= =?UTF-8?q?=EF=BC=9Aid=20=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=BC=95=E5=8F=91=E7=9A=84=20NPE=20=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/controller/admin/user/UserController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java index 2d659c332..ab2f4e27d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java @@ -119,7 +119,9 @@ public class UserController { @PreAuthorize("@ss.hasPermission('system:user:query')") public CommonResult 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));