From d20cf2979502fd58c999d2dc7df12e554a31d3df Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 24 七月 2024 11:07:54 +0800
Subject: [PATCH] 花城 排行范围选择本单位，呈现出了该账号单位以外的其它单位信息 党员活动的时长计算有问题。
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java | 9 ++++++++-
1 files changed, 8 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 70ddde8..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;
}
@@ -239,6 +245,7 @@
clusterMember.setNationCode(nationCode);
clusterMember.setImageUrl(Constants.CLUSTER_MEMBER_DEFAULT_IMAGE_URL);
clusterMember.setCreateAt(nowDate);
+ clusterMember.setCommunityId(communityId);
saveList.add(clusterMember);
memberMap.put(clusterMember.getIdCard(),clusterMember);
}
--
Gitblit v1.7.1