|
@@ -180,14 +180,20 @@ public class RepalGroupMemberServiceImpl extends ServiceImpl<RepalGroupMemberMap
|
|
if (Objects.isNull(beanResponse) || CollUtil.isEmpty(beanResponse.getBody())) {
|
|
if (Objects.isNull(beanResponse) || CollUtil.isEmpty(beanResponse.getBody())) {
|
|
throw new CommonException(CodeMsg.FAILED, "添加用户失败");
|
|
throw new CommonException(CodeMsg.FAILED, "添加用户失败");
|
|
}
|
|
}
|
|
|
|
+ List<RepalGroupMember> memberList = this.list(Wrappers.lambdaQuery(RepalGroupMember.class)
|
|
|
|
+ .in(RepalGroupMember::getUserId, beanResponse.getBody().stream().map(RepalRegUserDTO::getUserId).collect(Collectors.toList()))
|
|
|
|
+ .eq(RepalGroupMember::getDeleted, DeletedStatusEnum.NORMAL.getCode()));
|
|
|
|
+ Set<Long> userIdSet = memberList.stream().map(RepalGroupMember::getUserId).collect(Collectors.toSet());
|
|
for (RepalRegUserDTO regUserDTO : beanResponse.getBody()) {
|
|
for (RepalRegUserDTO regUserDTO : beanResponse.getBody()) {
|
|
- RepalGroupMember repalGroupMember = new RepalGroupMember();
|
|
|
|
- repalGroupMember.setUserId(regUserDTO.getUserId());
|
|
|
|
- repalGroupMember.setRepalGroupId(groupId);
|
|
|
|
- repalGroupMember.setMemberUserName(regUserDTO.getUserName());
|
|
|
|
- repalGroupMember.setRoleType(role.getRoleType());
|
|
|
|
- repalGroupMember.setRoleId(role.getId());
|
|
|
|
- this.save(repalGroupMember);
|
|
|
|
|
|
+ if (!userIdSet.contains(regUserDTO.getUserId())) {
|
|
|
|
+ RepalGroupMember repalGroupMember = new RepalGroupMember();
|
|
|
|
+ repalGroupMember.setUserId(regUserDTO.getUserId());
|
|
|
|
+ repalGroupMember.setRepalGroupId(groupId);
|
|
|
|
+ repalGroupMember.setMemberUserName(regUserDTO.getUserName());
|
|
|
|
+ repalGroupMember.setRoleType(role.getRoleType());
|
|
|
|
+ repalGroupMember.setRoleId(role.getId());
|
|
|
|
+ this.save(repalGroupMember);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|