From 30db42aa1c69e7f093efbc22dd560ecc959c6c7a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 09:19:18 +0800
Subject: [PATCH] 性别判断

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 9008b94..397b65f 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -142,7 +142,12 @@
         <if test="household.confirmFlag != null ">
             and jh.confirm_flag = #{household.confirmFlag}
         </if>
-
+        <if test="household.townStreetName!=null and household.townStreetName!=''">
+            and jda.town_street_name like concat('%',#{household.townStreetName},'%')
+        </if>
+        <if test="household.neiName!=null and household.neiName!=''">
+            and jda.nei_name like concat('%',#{household.neiName},'%')
+        </if>
         <if test="household.housingRentalId != null ">
             and jh.housing_rental_id = #{household.housingRentalId}
         </if>
@@ -277,7 +282,7 @@
         ( SELECT
         IF
         (
-        id_card IS NULL,
+        id_card IS NULL or id_card = '',
         '未知',
         IF
         (SUBSTRING( id_card, 17, 1 ) % 2 = 1, '男', '女' )) AS gender

--
Gitblit v1.9.3