diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java index 6cd37fc0e..6655052e7 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java @@ -103,17 +103,21 @@ public class SysUserDeptRoleServiceImpl implements ISysUserDeptRoleService { @Override @Transactional(rollbackFor = Exception.class) public int deleteSysUserDeptRoleByDeptIdAndUserIds(Long deptId, Long[] userIds) { - List memberUserIdList = FeignUtils.getReturnData( - remoteZoneService.checkUsersIsMemberInDept(deptId, userIds, SecurityConstants.INNER) - ); - // 检查该身份是否为会员用户,若是则将身份调整为会员并且不删除该身份 - if (memberUserIdList != null && !memberUserIdList.isEmpty()) { - userIds = Arrays.stream(userIds).filter(x -> !memberUserIdList.contains(x)).toArray(Long[]::new); - SysRole memberRole = sysRoleService.selectRoleByKey(SystemRole.ZONE_MEMBER.getRoleKey()); - for (Long userId : memberUserIdList) { - updateSysUserDeptRole(userId, deptId, memberRole.getRoleId()); + SysDept sysDept = sysDeptMapper.selectDeptById(deptId); + if (CacheConstants.DEPT_TYPE_TSZQ == sysDept.getDeptType()) { + List memberUserIdList = FeignUtils.getReturnData( + remoteZoneService.checkUsersIsMemberInDept(deptId, userIds, SecurityConstants.INNER) + ); + // 检查该身份是否为会员用户,若是则将身份调整为会员并且不删除该身份 + if (memberUserIdList != null && !memberUserIdList.isEmpty()) { + userIds = Arrays.stream(userIds).filter(x -> !memberUserIdList.contains(x)).toArray(Long[]::new); + SysRole memberRole = sysRoleService.selectRoleByKey(SystemRole.ZONE_MEMBER.getRoleKey()); + for (Long userId : memberUserIdList) { + updateSysUserDeptRole(userId, deptId, memberRole.getRoleId()); + } } } + if (userIds == null || userIds.length == 0) { return 1; }