From 451f13aff73f3ca0c693110081e8da776f061a8a Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Mon, 20 Nov 2023 10:14:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=88=BF=E5=B1=8B=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=A3bug=E4=BF=AE=E6=94=B9=20=20--renpc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PopulationServiceImpl.java           | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java b/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
index 72ec20f..6235913 100644
--- a/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
+++ b/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
@@ -83,10 +83,12 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
         params.put("outHouse", 0);
 
         // 解除脱敏
-        PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationVO.getPopulationInfoId());
-        params.put("name", populationInfoDTO.getName());
-        params.put("cardNum", populationInfoDTO.getIdcard());
-        params.put("phone", populationInfoDTO.getPhone());
+        if(null != params.get("populationInfoId") && StringUtils.isNotEmpty(params.get("populationInfoId").toString())) {
+            PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationVO.getPopulationInfoId());
+            params.put("name", populationInfoDTO.getName());
+            params.put("cardNum", populationInfoDTO.getIdcard());
+            params.put("phone", populationInfoDTO.getPhone());
+        }
 
         populationDao.save(params);
         return populationId;
@@ -184,7 +186,16 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
     public List<PopulationDTO> list(Map<String, Object> params) {
         List<PopulationDTO> list = populationDao.list(params);
         for (PopulationDTO populationDTO : list) {
-            PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
+            PopulationInfoDTO populationInfoDTO = new PopulationInfoDTO();
+            if(StringUtils.isNotEmpty(populationDTO.getPopulationInfoId())) {
+                populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
+            }else {
+                populationInfoDTO.setIdcard(populationDTO.getCardNum());
+                populationInfoDTO.setName(populationDTO.getName());
+                populationInfoDTO.setPhone(populationDTO.getPhone());
+                populationInfoDTO.setIdcardType("身份证");
+            }
+
             populationInfoService.getTuoMin(populationInfoDTO);
 
             populationDTO.setCardNum(populationInfoDTO.getIdcard());