From bc4f7752b37d2362532261ce2937dd185f9b6c57 Mon Sep 17 00:00:00 2001
From: "java_cuibaocheng@163.com" <java_cuibaocheng@163.com>
Date: Thu, 16 Nov 2023 15:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=E6=88=BF=E5=B1=8B=E4=B8=AD=E5=90=8C=E4=BD=8F?=
 =?UTF-8?q?=E4=BA=BA=E7=9A=84=E6=96=B0=E5=A2=9E=E4=B8=8E=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=E4=BA=BA=E5=8F=A3=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E9=80=89=E6=8B=A9=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=8E=BB=E8=84=B1=E6=95=8FBug=E4=BF=AE=E6=94=B9=20=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=A3=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF-=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=A3=E9=80=89=E6=8B=A9=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=BA=E5=91=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cm/population/service/house/impl/HouseServiceImpl.java    | 1 +
 src/main/resources/templates/house/update.html                | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java b/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
index 382cac0..239bcf9 100644
--- a/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
+++ b/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
@@ -155,6 +155,7 @@ public class HouseServiceImpl extends AbstractService implements IHouseService {
             populationdao.deleteByHouseId(houseId);
             for (PopulationVO populationVO : populationVOList) {
                 if(!"1".equals(populationVO.getOutHouse())) {
+                    populationVO.setHouseId(houseId);
                     populationService.save(token, populationVO);
                 }
             }
diff --git a/src/main/resources/templates/house/update.html b/src/main/resources/templates/house/update.html
index e7bb345..2070b50 100644
--- a/src/main/resources/templates/house/update.html
+++ b/src/main/resources/templates/house/update.html
@@ -419,7 +419,9 @@
         </div>
         <div class="layui-col-md2 layui-col-xs2" style="text-align: center;">
             <div class="layui-form-item" style="height: 33px;padding-top: 3px;" pane="">
-                <button type="button" class="layui-btn  layui-btn-sm out-population" data-population="{{item.populationInfoId}}">搬离房屋</button>
+                {{# if(item.populationId != '') { }}
+                    <button type="button" class="layui-btn  layui-btn-sm out-population" data-population="{{item.populationInfoId}}">搬离房屋</button>
+                {{# } }}
                 <button type="button" class="layui-btn  layui-btn-sm layui-btn-danger delete-population" data-population="{{item.populationInfoId}}">录错删除</button>
             </div>
         </div>