Browse Source

👈 重构安全框架底层代码支持当前用户修改

master
wangxiang 3 years ago
parent
commit
3f4546a15d
  1. 2
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AppController.java
  2. 7
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java

2
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<User> selectByPhone(@PathVariable String phone) { public R<User> selectByPhone(@PathVariable String phone) {
User user = userService.getOne(Wrappers.<User>query().lambda().eq(User::getPhone, phone)); User user = userService.getOne(Wrappers.<User>query().lambda().eq(User::getPhone, phone));
if (user == null) { if (user == null) {
return R.error(String.format("用户信息为%s", phone)); return R.error(String.format("用户信息手机号为%s为空,请检查当前多租户下是否有当前用户信息!", phone));
} }
return R.ok(userService.getUserAuthority(user)); return R.ok(userService.getUserAuthority(user));
} }

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

Loading…
Cancel
Save