dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(系统管理-用户管理): 修改用户角色后其他客户端不能实时同步信息

Browse Source
This commit is contained in:
fit2cloud-chenyw 2022-07-27 14:57:05 +08:00
parent 23dda3e22f
commit 5c279293be
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/main/java/io/dataease/service/sys/SysUserService.java
View File

@ -1,8 +1,8 @@
package io.dataease.service.sys; package io.dataease.service.sys;
import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.auth.api.dto.CurrentUserDto;
import io.dataease.auth.service.AuthUserService;
import io.dataease.auth.service.ExtAuthService; import io.dataease.auth.service.ExtAuthService;
import io.dataease.controller.sys.base.ConditionEntity;
import io.dataease.controller.sys.request.*; import io.dataease.controller.sys.request.*;
import io.dataease.ext.ExtSysUserAssistMapper; import io.dataease.ext.ExtSysUserAssistMapper;
import io.dataease.ext.ExtSysUserMapper; import io.dataease.ext.ExtSysUserMapper;
@ -11,7 +11,6 @@ import io.dataease.commons.constants.AuthConstants;
import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.BeanUtils;
import io.dataease.commons.utils.CodingUtil; import io.dataease.commons.utils.CodingUtil;
import io.dataease.controller.sys.base.BaseGridRequest;
import io.dataease.controller.sys.response.SysUserGridResponse; import io.dataease.controller.sys.response.SysUserGridResponse;
import io.dataease.controller.sys.response.SysUserRole; import io.dataease.controller.sys.response.SysUserRole;
import io.dataease.i18n.Translator; import io.dataease.i18n.Translator;
@ -57,6 +56,9 @@ public class SysUserService {
@Resource @Resource
private ExtSysUserAssistMapper extSysUserAssistMapper; private ExtSysUserAssistMapper extSysUserAssistMapper;
@Resource
private AuthUserService authUserService;
public List<SysUserGridResponse> query(UserGridRequest request) { public List<SysUserGridResponse> query(UserGridRequest request) {
String keyWord = request.getKeyWord(); String keyWord = request.getKeyWord();
@ -199,7 +201,6 @@ public class SysUserService {
* @param request * @param request
* @return * @return
*/ */
@CacheEvict(value = AuthConstants.USER_CACHE_NAME, key = "'user' + #request.userId")
@Transactional @Transactional
public int update(SysUserCreateRequest request) { public int update(SysUserCreateRequest request) {
checkUsername(request); checkUsername(request);
@ -214,6 +215,7 @@ public class SysUserService {
deleteUserRoles(user.getUserId());//先删除用户角色关联 deleteUserRoles(user.getUserId());//先删除用户角色关联
saveUserRoles(user.getUserId(), request.getRoleIds());//再插入角色关联 saveUserRoles(user.getUserId(), request.getRoleIds());//再插入角色关联
if (ObjectUtils.isEmpty(user.getDeptId())) user.setDeptId(0L); if (ObjectUtils.isEmpty(user.getDeptId())) user.setDeptId(0L);
authUserService.clearCache(user.getUserId());
return sysUserMapper.updateByPrimaryKeySelective(user); return sysUserMapper.updateByPrimaryKeySelective(user);
} }
@ -240,7 +242,7 @@ public class SysUserService {
* @param request * @param request
* @return * @return
*/ */
@CacheEvict(value = AuthConstants.USER_CACHE_NAME, key = "'user' + #request.userId")
@Transactional @Transactional
public int updatePersonBasicInfo(SysUserCreateRequest request) { public int updatePersonBasicInfo(SysUserCreateRequest request) {
checkEmail(request); checkEmail(request);
@ -252,6 +254,7 @@ public class SysUserService {
user.setEmail(request.getEmail()); user.setEmail(request.getEmail());
user.setNickName(request.getNickName()); user.setNickName(request.getNickName());
user.setPhone(request.getPhone()); user.setPhone(request.getPhone());
authUserService.clearCache(request.getUserId());
return sysUserMapper.updateByPrimaryKeySelective(user); return sysUserMapper.updateByPrimaryKeySelective(user);
} }