|
|
|
@ -71,7 +71,7 @@ public class UserController {
@@ -71,7 +71,7 @@ public class UserController {
|
|
|
|
|
public R info() { |
|
|
|
|
User user = userService.getOne(Wrappers.<User>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 {
@@ -105,7 +105,7 @@ public class UserController {
|
|
|
|
|
public R selectByUserName(@PathVariable String userName) { |
|
|
|
|
User user = userService.getOne(Wrappers.<User>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 {
@@ -220,6 +220,9 @@ public class UserController {
|
|
|
|
|
@PreAuthorize("@pms.hasPermission('user_edit')") |
|
|
|
|
public R resetTenant() { |
|
|
|
|
User user = userService.getOne(Wrappers.<User>query().lambda().eq(User::getId, SecurityUtils.getUser().getId())); |
|
|
|
|
if (user == null) { |
|
|
|
|
return R.error("用户信息为空,请检查当前多租户下是否有当前用户信息!"); |
|
|
|
|
} |
|
|
|
|
userService.setCurrentUserTenant(user.getTenantId()); |
|
|
|
|
return R.ok(); |
|
|
|
|
} |
|
|
|
|