From cefcbc439ca3df68924675023774ae6afe4018e8 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Tue, 30 Jan 2024 16:21:00 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/house/house-mapper.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mybatis/mapper/house/house-mapper.xml b/src/main/resources/mybatis/mapper/house/house-mapper.xml
index 2e3d410..f33e5b2 100644
--- a/src/main/resources/mybatis/mapper/house/house-mapper.xml
+++ b/src/main/resources/mybatis/mapper/house/house-mapper.xml
@@ -847,7 +847,7 @@
                 #{houseIds[${index}]}
             </foreach>
         </if>
-        <if test="(populationInfoId != null and populationInfoId != '') or (cardNum != '' and cardNum != '')">
+        <if test="populationInfoId != null and populationInfoId != ''">
             AND
             t1.house_id IN (
             SELECT
@@ -859,6 +859,17 @@
             <if test="populationInfoId != null and populationInfoId != ''">
                 AND hp.population_info_id = #{populationInfoId}
             </if>
+            )
+        </if>
+        <if test="cardNum != null and cardNum != ''">
+            AND
+            t1.house_id IN (
+            SELECT
+            hp.house_id
+            FROM
+            house_population hp
+            WHERE
+            1 = 1
             <if test="cardNum != null and cardNum != ''">
                 AND hp.card_num = #{cardNum}
             </if>