Compare commits
No commits in common. "b82158793584a3d68ad18d0c64da8f1d626c9779" and "1301b5d9ea99976409f88b77afb4de7d72d5fe50" have entirely different histories.
b821587935
...
1301b5d9ea
|
@ -181,15 +181,14 @@ public class PromoterServiceImpl implements PromoterService {
|
||||||
if (CollUtil.isEmpty(importUsers)) {
|
if (CollUtil.isEmpty(importUsers)) {
|
||||||
throw exception(PROMOTER_IMPORT_LIST_IS_EMPTY);
|
throw exception(PROMOTER_IMPORT_LIST_IS_EMPTY);
|
||||||
}
|
}
|
||||||
PromoterImportRespVO respVO = PromoterImportRespVO.builder().createUsernames(new ArrayList<>())
|
|
||||||
.updateUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build();
|
|
||||||
Set<String> collect = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toSet());
|
Set<String> collect = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toSet());
|
||||||
List<MemberUserDO> list = memberUserService.getByMobileList(collect);
|
List<MemberUserDO> list = memberUserService.getByMobileList(collect);
|
||||||
if (!CollectionUtils.isEmpty(list)) {
|
if (!CollectionUtils.isEmpty(list)) {
|
||||||
List<String> collect1 = list.stream().map(MemberUserDO::getMobile).collect(Collectors.toList());
|
List<String> collect1 = list.stream().map(MemberUserDO::getMobile).collect(Collectors.toList());
|
||||||
respVO.getFailureUsernames().put("电话号码:" + collect1, "重复");
|
throw new ServiceException(200, "电话号码:" + collect1 + "重复");
|
||||||
}
|
}
|
||||||
|
PromoterImportRespVO respVO = PromoterImportRespVO.builder().createUsernames(new ArrayList<>())
|
||||||
|
.updateUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build();
|
||||||
List<DeptRespDTO> deptRespDTOList = deptApi.getDeptList();
|
List<DeptRespDTO> deptRespDTOList = deptApi.getDeptList();
|
||||||
Map<String, DeptRespDTO> nameList = deptRespDTOList.stream().collect(toMap(DeptRespDTO::getParentOrganizationName, value -> value, (value1, value2) -> value1));
|
Map<String, DeptRespDTO> nameList = deptRespDTOList.stream().collect(toMap(DeptRespDTO::getParentOrganizationName, value -> value, (value1, value2) -> value1));
|
||||||
importUsers.forEach(importUser -> {
|
importUsers.forEach(importUser -> {
|
||||||
|
|
Loading…
Reference in New Issue