From 59709ee239f79291206753f86939d538a430890f Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 31 May 2022 10:35:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=B1=85=E6=B0=91=E5=9C=A8=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E7=AB=AF=E6=98=AF=E5=90=A6=E6=98=AF=E5=BF=97=E6=84=BF?=
 =?UTF-8?q?=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserServiceImpl.java   | 23 +++++++++++--------
 .../impl/IcVolunteerPolyServiceImpl.java      | 16 +++++++------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index d645a2c4f9..a5ecb108e3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -2242,16 +2242,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         LambdaQueryWrapper<UserBaseInfoEntity> baseInfoWrapper = new LambdaQueryWrapper<>();
         baseInfoWrapper.eq(UserBaseInfoEntity::getCustomerId, formDTO.getCustomerId());
         baseInfoWrapper.eq(UserBaseInfoEntity::getIdNum, formDTO.getIdCard());
-        UserBaseInfoEntity baseInfo = userBaseInfoDao.selectOne(baseInfoWrapper);
-        if (null != baseInfo) {
-            //获取志愿者信息
-            Result<VolunteerInfoDTO> volunteerResult = epmetHeartOpenFeignClient.queryUserVolunteerInfo(baseInfo.getUserId());
-            if (!volunteerResult.success()) {
-                log.error("志愿者变更-获取小程序志愿者失败");
-                return result;
-            }
-            if (null != volunteerResult.getData()) {
-                result.setIsVolunteer(NumConstant.ONE_STR);
+        List<UserBaseInfoEntity> baseInfoList = userBaseInfoDao.selectList(baseInfoWrapper);
+        if (CollectionUtils.isNotEmpty(baseInfoList)) {
+            for (UserBaseInfoEntity baseInfo : baseInfoList) {
+                //获取志愿者信息
+                Result<VolunteerInfoDTO> volunteerResult = epmetHeartOpenFeignClient.queryUserVolunteerInfo(baseInfo.getUserId());
+                if (!volunteerResult.success()) {
+                    log.error("志愿者变更-获取小程序志愿者失败");
+                    continue;
+                }
+                if (null != volunteerResult.getData()) {
+                    result.setIsVolunteer(NumConstant.ONE_STR);
+                    break;
+                }
             }
         }
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java
index c2de05f566..f2477ae314 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java
@@ -355,13 +355,15 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
                 LambdaQueryWrapper<UserBaseInfoEntity> baseInfoWrapper = new LambdaQueryWrapper<>();
                 baseInfoWrapper.eq(UserBaseInfoEntity::getCustomerId, customerId);
                 baseInfoWrapper.eq(UserBaseInfoEntity::getIdNum, icUser.getIdCard());
-                UserBaseInfoEntity baseInfo = userBaseInfoDao.selectOne(baseInfoWrapper);
-                if (null != baseInfo) {
-                    ResiVolunteerAuthenticateFormDTO formDTO = new ResiVolunteerAuthenticateFormDTO();
-                    formDTO.setCustomerId(customerId);
-                    formDTO.setUserId(baseInfo.getUserId());
-                    formDTO.setGridId(icUser.getGridId());
-                    epmetHeartOpenFeignClient.addVolunteer(formDTO);
+                List<UserBaseInfoEntity> baseInfoList = userBaseInfoDao.selectList(baseInfoWrapper);
+                if (CollectionUtils.isNotEmpty(baseInfoList)) {
+                    baseInfoList.forEach(baseInfo -> {
+                        ResiVolunteerAuthenticateFormDTO formDTO = new ResiVolunteerAuthenticateFormDTO();
+                        formDTO.setCustomerId(customerId);
+                        formDTO.setUserId(baseInfo.getUserId());
+                        formDTO.setGridId(icUser.getGridId());
+                        epmetHeartOpenFeignClient.addVolunteer(formDTO);
+                    });
                 }
             } else {
                 if (!isDyzxh) {