|
@@ -920,7 +920,18 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
|
|
tbUser.setPassword(SystemConstant.DEFAULT_PASSWORD);
|
|
tbUser.setPassword(SystemConstant.DEFAULT_PASSWORD);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- tbUserList.add(tbUser);
|
|
|
|
|
|
+ if (!CollectionUtils.isEmpty(tbUserList)) {
|
|
|
|
+ TBUser finalTbUser = tbUser;
|
|
|
|
+ List<TBUser> tbUserRepeatList = tbUserList.stream().filter(s -> s.equals(finalTbUser))
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
+ if (!CollectionUtils.isEmpty(tbUserRepeatList)) {
|
|
|
|
+ tbUser.setId(tbUserRepeatList.get(0).getId());
|
|
|
|
+ } else {
|
|
|
|
+ tbUserList.add(tbUser);
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ tbUserList.add(tbUser);
|
|
|
|
+ }
|
|
|
|
|
|
QueryWrapper<TBExamInvigilateUser> tbExamInvigilateUserQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<TBExamInvigilateUser> tbExamInvigilateUserQueryWrapper = new QueryWrapper<>();
|
|
tbExamInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getOrgId, orgId)
|
|
tbExamInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getOrgId, orgId)
|