From 56cfc9f68e5f5cc42e9a85dab89e21dc4704bc14 Mon Sep 17 00:00:00 2001
From: "java_cuibaocheng@163.com" <java_cuibaocheng@163.com>
Date: Sat, 4 Nov 2023 15:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=BB=B6=E5=8F=B7?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20,=20=E4=BA=BA=E5=8F=A3=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=20,=20=E5=B9=B4=E9=BE=84?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../populationinfo/population-info-mapper.xml | 157 +++++++++---------
 1 file changed, 80 insertions(+), 77 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
index 290ae5f..b33b96c 100644
--- a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
+++ b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
@@ -934,85 +934,88 @@
     <!-- 基础人口信息列表 -->
     <select id="list" parameterType="map" resultMap="populationInfoDTO">
         SELECT
-        t1.population_info_id,
-        t1.name,
-        t1.idcard,
-        t1.idcard_type,
-        t1.birthday,
-        t1.sex,
-        t1.nation,
-        t1.education,
-        t1.description,
-        t1.organization,
-        t1.religion,
-        t1.marriage_status,
-        t1.marriage_change_time,
-        t1.marriage_first_time,
-        t1.social_security,
-        t1.health_status,
-        t1.department_type,
-        t1.department,
-        t1.pastion,
-        t1.pastion_title,
-        t1.expertise,
-        t1.phone,
-        t1.father_id,
-        t1.father_name,
-        t1.father_idcard,
-        t1.father_phone,
-        t1.mother_id,
-        t1.mother_name,
-        t1.mother_idcard,
-        t1.mother_phone,
-        t1.relationship,
-        t1.domicile_address,
-        t1.domicile_address_type,
-        t1.domicile_area_code,
-        t1.domicile_area_name,
-        t1.origin_address,
-        t1.origin_area_code,
-        t1.origin_area_name,
-        t1.flow_time,
-        t1.flow_reason,
-        t1.flow_reasontext,
-        t1.is_oldage,
-        t1.oldage_type,
-        t1.oldage_department,
-        t1.oldage_lift,
-        t1.oldage_health_status,
-        t1.oldage_selfcare,
-        t1.oldage_live,
-        t1.is_disability,
-        t1.disability_type,
-        t1.disability_level,
-        t1.disability_number,
-        t1.disability_carnumber,
-        t1.disability_address,
-        t1.disability_area_code,
-        t1.disability_area_name,
-        t1.disability_income,
-        t1.disability_house,
-        t1.disability_time,
-        t1.disability_guardian,
-        t1.disability_guardian_phone,
-        t1.disability_guardian_relation,
-        t1.is_military,
-        t1.military_time,
-        t1.military_position,
-        t1.is_succour,
-        t1.succour_dibao,
-        t1.succour_help,
-        t1.succour_difficulty,
-        t1.succour_subsidy,
-        t1.is_party,
-        t1.party_organization,
-        t1.party_time,
-        t1.othertext,
-        t1.creator
+            t1.population_info_id,
+            t1.name,
+            t1.idcard,
+            t1.idcard_type,
+            t1.birthday,
+            t1.sex,
+            t1.nation,
+            t1.education,
+            t1.description,
+            t1.organization,
+            t1.religion,
+            t1.marriage_status,
+            t1.marriage_change_time,
+            t1.marriage_first_time,
+            t1.social_security,
+            t1.health_status,
+            t1.department_type,
+            t1.department,
+            t1.pastion,
+            t1.pastion_title,
+            t1.expertise,
+            t1.phone,
+            t1.father_id,
+            t1.father_name,
+            t1.father_idcard,
+            t1.father_phone,
+            t1.mother_id,
+            t1.mother_name,
+            t1.mother_idcard,
+            t1.mother_phone,
+            t1.relationship,
+            t1.domicile_address,
+            t1.domicile_address_type,
+            t1.domicile_area_code,
+            t1.domicile_area_name,
+            t1.origin_address,
+            t1.origin_area_code,
+            t1.origin_area_name,
+            t1.flow_time,
+            t1.flow_reason,
+            t1.flow_reasontext,
+            t1.is_oldage,
+            t1.oldage_type,
+            t1.oldage_department,
+            t1.oldage_lift,
+            t1.oldage_health_status,
+            t1.oldage_selfcare,
+            t1.oldage_live,
+            t1.is_disability,
+            t1.disability_type,
+            t1.disability_level,
+            t1.disability_number,
+            t1.disability_carnumber,
+            t1.disability_address,
+            t1.disability_area_code,
+            t1.disability_area_name,
+            t1.disability_income,
+            t1.disability_house,
+            t1.disability_time,
+            t1.disability_guardian,
+            t1.disability_guardian_phone,
+            t1.disability_guardian_relation,
+            t1.is_military,
+            t1.military_time,
+            t1.military_position,
+            t1.is_succour,
+            t1.succour_dibao,
+            t1.succour_help,
+            t1.succour_difficulty,
+            t1.succour_subsidy,
+            t1.is_party,
+            t1.party_organization,
+            t1.party_time,
+            t1.othertext,
+            t1.creator
         FROM
-        population_population_info t1
+            population_population_info t1
         WHERE
-        t1.is_delete = 0
+            t1.is_delete = 0
+        <if test="creator != null and creator != ''">
+            AND t1.creator = #{creator}
+        </if>
         <if test="idcard != null and idcard != ''">
             AND t1.idcard LIKE CONCAT('%', #{idcard}, '%')
         </if>