空指针的bug

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -487,9 +487,9 @@ public class GovProjectServiceImpl implements GovProjectService {
 		if (!org.springframework.util.CollectionUtils.isEmpty(userList)) {
 			//2-1.根据身份证号查询负能平台用户信息
 			IcResiUserDTO icResiUserDTO = epmetUserService.getIcResiUser(userList.get(0).getIdNum(), formDTO.getCustomerId());
-			resultDTO.setIcUserId(icResiUserDTO.getId());
-			resultDTO.setIcUserName(icResiUserDTO.getName());
 			if (null != icResiUserDTO) {
+				resultDTO.setIcUserId(icResiUserDTO.getId());
+				resultDTO.setIcUserName(icResiUserDTO.getName());
 				//2-2.查询人员的家庭成员数据
 				List<ProjectAnalysisResultDTO.Home> homeList = epmetUserService.getHomeUserList(icResiUserDTO.getHomeId(), icResiUserDTO.getId());
 				resultDTO.setHomeUserList(homeList);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java

@@ -17,6 +17,8 @@ import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.VolunteerService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,6 +31,7 @@ import java.util.stream.Collectors;
  * @Date 2021/12/10 5:48 下午
  * @Version 1.0
  */
+@Slf4j
 @Service
 public class VolunteerServiceImpl implements VolunteerService, ResultDataResolver {
 
@@ -134,7 +137,10 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve
             VolunteerDistributionResultDTO.Distribution distribution = new VolunteerDistributionResultDTO.Distribution();
 
             ResiUserBaseInfoResultDTO userBaseInfo = userBaseInfoDao.selecUserBaseInfoByUserId(volunteerEpmetUserId);
-
+            if (userBaseInfo == null || StringUtils.isBlank(userBaseInfo.getIdNum())){
+                log.warn("getVolunteerDistribution selecUserBaseInfoByUserId return null or idCard is null，volunteerEpmetUserId:{}", volunteerEpmetUserId);
+                continue;
+            }
             //使用身份证号查询ic resi信息
             IcResiUserDTO icResiUserInfo = icResiUserDao.selectIdByIdCard(customerId, userBaseInfo.getIdNum(), null);
             if (icResiUserInfo == null) {