根据身份证判断居民在小程序端是否是志愿者

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);
+        List<UserBaseInfoEntity> baseInfoList = userBaseInfoDao.selectList(baseInfoWrapper);
-        if (null != baseInfo) {
+        if (CollectionUtils.isNotEmpty(baseInfoList)) {
-            //获取志愿者信息
+            for (UserBaseInfoEntity baseInfo : baseInfoList) {
-            Result<VolunteerInfoDTO> volunteerResult = epmetHeartOpenFeignClient.queryUserVolunteerInfo(baseInfo.getUserId());
+                //获取志愿者信息
-            if (!volunteerResult.success()) {
+                Result<VolunteerInfoDTO> volunteerResult = epmetHeartOpenFeignClient.queryUserVolunteerInfo(baseInfo.getUserId());
-                log.error("志愿者变更-获取小程序志愿者失败");
+                if (!volunteerResult.success()) {
-                return result;
+                    log.error("志愿者变更-获取小程序志愿者失败");
-            }
+                    continue;
-            if (null != volunteerResult.getData()) {
+                }
-                result.setIsVolunteer(NumConstant.ONE_STR);
+                if (null != volunteerResult.getData()) {
+                    result.setIsVolunteer(NumConstant.ONE_STR);
+                    break;
+                }
             }
         }
 

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);
+                List<UserBaseInfoEntity> baseInfoList = userBaseInfoDao.selectList(baseInfoWrapper);
-                if (null != baseInfo) {
+                if (CollectionUtils.isNotEmpty(baseInfoList)) {
-                    ResiVolunteerAuthenticateFormDTO formDTO = new ResiVolunteerAuthenticateFormDTO();
+                    baseInfoList.forEach(baseInfo -> {
-                    formDTO.setCustomerId(customerId);
+                        ResiVolunteerAuthenticateFormDTO formDTO = new ResiVolunteerAuthenticateFormDTO();
-                    formDTO.setUserId(baseInfo.getUserId());
+                        formDTO.setCustomerId(customerId);
-                    formDTO.setGridId(icUser.getGridId());
+                        formDTO.setUserId(baseInfo.getUserId());
-                    epmetHeartOpenFeignClient.addVolunteer(formDTO);
+                        formDTO.setGridId(icUser.getGridId());
+                        epmetHeartOpenFeignClient.addVolunteer(formDTO);
+                    });
                 }
             } else {
                 if (!isDyzxh) {