From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml |   24 +++---------------------
 1 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index 9467775..38db6f9 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -9,15 +9,12 @@
         <result column="name" property="name"/>
         <result column="phone_number" property="phoneNumber"/>
         <result column="associated_user_id" property="associatedUserId"/>
-        <result column="associated_user_name" property="associatedUserName"/>
         <result column="relationship" property="relationship"/>
         <!--        <result column="primary_contact" property="primaryContact"/>-->
         <result column="residential_status" property="residentialStatus"/>
         <result column="gender" property="gender"/>
         <result column="birthday" property="birthday"/>
         <result column="id_card" property="idCard"/>
-        <result column="hkmt_pass" property="hkmtPass"/>
-        <result column="passport" property="passport"/>
         <result column="ethnicity" property="ethnicity"/>
         <result column="education" property="education"/>
         <result column="hukou_registration" property="hukouRegistration"/>
@@ -49,15 +46,12 @@
             phone_number,
             associated_user_id,
             role_type,
-            associated_user_name,
             relationship,
             is_primary_contact,
             residential_status,
             gender,
             birthday,
             id_card,
-            hkmt_pass,
-            passport,
             ethnicity,
             education,
             hukou_registration,
@@ -122,7 +116,6 @@
         jh.phone_number,
         jh.associated_user_id,
         jh.role_type,
-        jh.associated_user_name,
         jh.relationship,
         jh.is_primary_contact,
         jh.residential_status,
@@ -130,9 +123,7 @@
         jh.birthday,
         jh.id_card,
         jh.card_type,
-        jh.hkmt_pass,
         ifnull( jh.gender, CASE WHEN substring( jh.id_card, 17, 1 )% 2 = 1 THEN 1 ELSE 0 END ) AS gender,
-        jh.passport,
         jh.ethnicity,
         jh.education,
         jh.resident_type,
@@ -248,14 +239,11 @@
         jh.phone_number,
         jh.associated_user_id,
         jh.role_type,
-        jh.associated_user_name,
         jh.relationship,
         jh.is_primary_contact,
         jh.residential_status,
         jh.birthday,
         jh.id_card,
-        jh.hkmt_pass,
-        jh.passport,
         ifnull( jh.gender, CASE WHEN substring( jh.id_card, 17, 1 )% 2 = 1 THEN 1 ELSE 0 END ) AS gender,
         jh.ethnicity,
         jh.education,
@@ -372,9 +360,9 @@
     <select id="getHouseholdListById" resultMap="householdAndLabelMap">
         select
             jh.id,jh.house_code,jh.name,jh.phone_number,jh.associated_user_id,
-            jh.role_type,jh.associated_user_name,jh.relationship,jh.is_primary_contact,
+            jh.role_type,jh.relationship,jh.is_primary_contact,
             jh.residential_status,jh.gender,jh.birthday,jh.id_card,
-            jh.card_type,jh.card_no,jh.hkmt_pass,jh.passport,
+            jh.card_type,jh.card_no,
             jh.ethnicity,jh.education,jh.resident_type,
             jh.hukou_registration,jh.resident_adcode,jh.native_place_adcode,
 			jh.religious_belief,jh.health_status,jh.disease_name,
@@ -417,7 +405,7 @@
         jh.house_code houseCode,
         jh.name,jh.phone_number phoneNumber,jh.role_type roleType,jh.relationship relationship,
         jh.is_primary_contact isPrimaryContact,jh.residential_status residentialStatus,jh.gender,
-        jh.birthday,jh.id_card idCard,jh.hkmt_pass hkmtPass,jh.passport,jh.ethnicity,jh.education,
+        jh.birthday,jh.id_card idCard,jh.ethnicity,jh.education,
         jh.hukou_registration hukouRegistration,jh.work_status workStatus,jh.employer,jh.marital_status maritalStatus,
         jh.card_number cardNumber,jh.other_contact otherContact,jh.current_address currentAddress,
         jh.disability_cert disabilityCert,jh.party_ember partyEmber,jh.remark,
@@ -632,14 +620,11 @@
         jh.phone_number,
         jh.associated_user_id,
         jh.role_type,
-        jh.associated_user_name,
         jh.relationship,
         jh.is_primary_contact,
         jh.residential_status,
         jh.birthday,
         jh.id_card,
-        jh.hkmt_pass,
-        jh.passport,
         ifnull( jh.gender, CASE WHEN substring( jh.id_card, 17, 1 )% 2 = 1 THEN 1 ELSE 0 END ) AS gender,
         jh.ethnicity,
         jh.education,
@@ -737,7 +722,6 @@
         jh.phone_number,
         jh.associated_user_id,
         jh.role_type,
-        jh.associated_user_name,
         jh.relationship,
         jh.is_primary_contact,
         jh.residential_status,
@@ -745,9 +729,7 @@
         jh.birthday,
         jh.id_card,
         jh.card_type,
-        jh.hkmt_pass,
         ifnull( jh.gender, CASE WHEN substring( jh.id_card, 17, 1 )% 2 = 1 THEN 1 ELSE 0 END ) AS gender,
-        jh.passport,
         jh.ethnicity,
         jh.education,
         jh.resident_type,

--
Gitblit v1.9.3