From 3f4546a15d2a8c1bed7cd6551fb31f4ddd31a50c Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 18 May 2022 23:59:29 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=88=20=E9=87=8D=E6=9E=84=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=A1=86=E6=9E=B6=E5=BA=95=E5=B1=82=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cloud/kicc/system/controller/AppController.java | 2 +- .../com/cloud/kicc/system/controller/UserController.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AppController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AppController.java index 659f7f79..b0bd865b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AppController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AppController.java @@ -48,7 +48,7 @@ public class AppController { public R selectByPhone(@PathVariable String phone) { User user = userService.getOne(Wrappers.query().lambda().eq(User::getPhone, phone)); if (user == null) { - return R.error(String.format("用户信息为空 %s", phone)); + return R.error(String.format("用户信息手机号为%s为空,请检查当前多租户下是否有当前用户信息!", phone)); } return R.ok(userService.getUserAuthority(user)); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java index f09c9cb5..4222b8df 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java @@ -71,7 +71,7 @@ public class UserController { public R info() { User user = userService.getOne(Wrappers.query().lambda().eq(User::getUserName, SecurityUtils.getUser().getUsername())); if (user == null) { - return R.error("获取当前用户信息失败"); + return R.error("用户信息为空,请检查当前多租户下是否有当前用户信息!"); } return R.ok(userService.getUserAuthority(user)); } @@ -105,7 +105,7 @@ public class UserController { public R selectByUserName(@PathVariable String userName) { User user = userService.getOne(Wrappers.query().lambda().eq(User::getUserName, userName)); if (user == null) { - return R.error(String.format("用户信息为空 %s", userName)); + return R.error(String.format("用户信息%s为空,请检查当前多租户下是否有当前用户信息!", userName)); } return R.ok(userService.getUserAuthority(user)); } @@ -220,6 +220,9 @@ public class UserController { @PreAuthorize("@pms.hasPermission('user_edit')") public R resetTenant() { User user = userService.getOne(Wrappers.query().lambda().eq(User::getId, SecurityUtils.getUser().getId())); + if (user == null) { + return R.error("用户信息为空,请检查当前多租户下是否有当前用户信息!"); + } userService.setCurrentUserTenant(user.getTenantId()); return R.ok(); }