From 7e01b349c769045abeeeb6cf98241c8d60d0aeb3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 19 六月 2024 09:24:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index fc48ad9..2e7eb25 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -385,11 +385,11 @@
if(dataList == null || dataList.size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�");
}
- List<String> idCardList = dataList.stream().map(m->m.getIdCard()).collect(Collectors.toList());
- Set<String> set = new HashSet<>(idCardList);
- if(idCardList.size() != set.size()){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁瀛樺湪韬唤璇佸彿鐩稿悓鏁版嵁锛�");
- }
+// List<String> idCardList = dataList.stream().map(m->m.getIdCard()).collect(Collectors.toList());
+// Set<String> set = new HashSet<>(idCardList);
+// if(idCardList.size() != set.size()){
+// throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁瀛樺湪韬唤璇佸彿鐩稿悓鏁版嵁锛�");
+// }
List<DispatchUnit> dispatchUnitList = new ArrayList<>();
if(!Objects.isNull(solutionId)){
dispatchUnitList = dispatchUnitJoinMapper.selectJoinList(DispatchUnit.class,
@@ -416,6 +416,7 @@
}
}
long index = Constants.TWO;
+ Map<String,String> idCardMap = new HashMap<>();
for(MemberImport model : dataList){
if(StringUtils.isBlank(model.getIdCard())||model.getIdCard().length()!=18){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹韩浠借瘉淇℃伅寮傚父锛�");
@@ -426,6 +427,10 @@
if(StringUtils.isBlank(model.getName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹鍚嶄俊鎭紓甯革紒");
}
+ if(Objects.nonNull(idCardMap.get(model.getIdCard()))){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹韩浠借瘉鍙枫��"+model.getIdCard()+"銆戝瓨鍦ㄧ浉鍚屾暟鎹紒");
+ }
+ idCardMap.put(model.getIdCard(), model.getIdCard());
index = index + Constants.ONE;
if(CollectionUtils.isNotEmpty(list)){
Optional<Member> memberOptional= list.stream().filter(m->m.getIdcardNo().equals(model.getIdCard())).findFirst();
--
Gitblit v1.9.3