From 15655987bc4e2d330320d37c06f54e12bf54713e Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Fri, 17 Nov 2023 15:53:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A5=E4=BA=BA=E6=89=BE=E6=88=BF=E3=80=81?=
 =?UTF-8?q?=E4=BB=A5=E6=88=BF=E6=89=BE=E4=BA=BA=E4=BF=A1=E6=81=AF=E8=84=B1?=
 =?UTF-8?q?=E6=95=8F=20=20--renpc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../population/impl/PopulationServiceImpl.java        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 d08c275..72ec20f 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
@@ -182,7 +182,16 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
 
     @Override
     public List<PopulationDTO> list(Map<String, Object> params) {
-        return populationDao.list(params);
+        List<PopulationDTO> list = populationDao.list(params);
+        for (PopulationDTO populationDTO : list) {
+            PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
+            populationInfoService.getTuoMin(populationInfoDTO);
+
+            populationDTO.setCardNum(populationInfoDTO.getIdcard());
+            populationDTO.setName(populationInfoDTO.getName());
+            populationDTO.setPhone(populationInfoDTO.getPhone());
+        }
+        return list;
     }
 
     @Override