From 3c884ccd7b51edf3b36840bf99de5edaa41a38a7 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 12 十月 2022 19:05:28 +0800
Subject: [PATCH] 三说会堂事件流程处理

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java
index 95b9854..c070136 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java
@@ -205,7 +205,13 @@
             if(!isOnly(memberExcel.getIdCard(),memberMap)){
                 ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
                 BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
-                memberExcelErrorVO.setError("该成员已存在");
+                //判断该成员是否是已存在还是身份证号码重复
+                ComClusterOrganizationMemberDO memberDO = (ComClusterOrganizationMemberDO)memberMap.get(memberExcel.getIdCard());
+                if(memberDO.getName().equals(memberExcel.getName())){
+                    memberExcelErrorVO.setError("该成员已存在");
+                }else{
+                    memberExcelErrorVO.setError("身份证号重复");
+                }
                 mistakes.add(memberExcelErrorVO);
                 continue;
             }

--
Gitblit v1.7.1