|
@@ -612,11 +612,12 @@ public class TBUserController {
|
|
|
throw new BusinessException(ExceptionResultEnum.ORG_ID_IS_NULL);
|
|
|
}
|
|
|
boolean cacheClean = false;
|
|
|
- TBUser loginUser = null;
|
|
|
+ TBUser loginUser = (TBUser) ServletUtil.getRequestAccount();
|
|
|
+ TBUser dbUser = null;
|
|
|
AuthDto authDto = null;
|
|
|
if (Objects.nonNull(mapParameter.get("id"))) {
|
|
|
- loginUser = tbUserService.getById(Long.parseLong(String.valueOf(mapParameter.get("id"))));
|
|
|
- authDto = (AuthDto) redisUtil.get(SystemConstant.userOauth + loginUser.getId());
|
|
|
+ dbUser = tbUserService.getById(Long.parseLong(String.valueOf(mapParameter.get("id"))));
|
|
|
+ authDto = (AuthDto) redisUtil.get(SystemConstant.userOauth + dbUser.getId());
|
|
|
}
|
|
|
Gson gson = new Gson();
|
|
|
TBUser tbUser = gson.fromJson(gson.toJson(mapParameter), TBUser.class);
|
|
@@ -628,7 +629,7 @@ public class TBUserController {
|
|
|
if (roleSet.size() > 1) {
|
|
|
throw new BusinessException("暂不支持多个角色");
|
|
|
}
|
|
|
- if ((Objects.nonNull(tbUser) && Objects.nonNull(loginUser) && !tbUser.equals(loginUser))
|
|
|
+ if ((Objects.nonNull(tbUser) && Objects.nonNull(dbUser) && !tbUser.equals(dbUser))
|
|
|
|| (Objects.nonNull(authDto) && !roleSet.equals(authDto.getRoleCodes()))) {
|
|
|
cacheClean = true;
|
|
|
}
|