From 84fae9aed66f2841b58b2ef66ff7c11cd0dbaacd Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 08 十月 2021 17:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java | 3 ++-
1 files changed, 2 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 86d1491..95b9854 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
@@ -223,7 +223,7 @@
}
//判断民族是否存在
- if(!isOnly(memberExcel.getNation(),nationMap)){
+ if(isOnly(memberExcel.getNation(),nationMap)){
ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
memberExcelErrorVO.setError("您填写的民族不存在");
@@ -239,6 +239,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