diff --git a/src/main/resources/mybatis/mapper/house/house-mapper.xml b/src/main/resources/mybatis/mapper/house/house-mapper.xml index f33e5b2..a374565 100644 --- a/src/main/resources/mybatis/mapper/house/house-mapper.xml +++ b/src/main/resources/mybatis/mapper/house/house-mapper.xml @@ -849,13 +849,13 @@ AND - t1.house_id IN ( + t1.house_id IN ( SELECT - hp.house_id + hp.house_id FROM - house_population hp + house_population hp WHERE - 1 = 1 + hp.is_delete = 0 AND hp.out_house != '1' AND hp.population_info_id = #{populationInfoId} @@ -863,13 +863,13 @@ AND - t1.house_id IN ( + t1.house_id IN ( SELECT - hp.house_id + hp.house_id FROM - house_population hp + house_population hp WHERE - 1 = 1 + hp.is_delete = 0 AND hp.out_house != '1' AND hp.card_num = #{cardNum} diff --git a/src/main/resources/templates/populationinfo/bind.html b/src/main/resources/templates/populationinfo/bind.html index 91bb9d7..68314b5 100644 --- a/src/main/resources/templates/populationinfo/bind.html +++ b/src/main/resources/templates/populationinfo/bind.html @@ -32,6 +32,7 @@
+
@@ -56,14 +57,22 @@ - +