From 1e829d12e81d89effc8dee180a8af8bfe100f9fc Mon Sep 17 00:00:00 2001
From: "java_cuibaocheng@163.com" <java_cuibaocheng@163.com>
Date: Thu, 16 Nov 2023 15:20:47 +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  | 6 ------
 src/main/resources/templates/house/save.html                | 2 +-
 src/main/resources/templates/house/update.html              | 3 ++-
 3 files changed, 3 insertions(+), 8 deletions(-)

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 e336cde..6e7a659 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
@@ -156,12 +156,6 @@ public class HouseServiceImpl extends AbstractService implements IHouseService {
                     populationdao.deleteById(populationVO.getPopulationId());
                 }
             }
-            populationdao.deleteById(houseId);
-            for (PopulationVO populationVO : populationVOList) {
-                if(!"1".equals(populationVO.getOutHouse())) {
-                    populationService.save(token, populationVO);
-                }
-            }
         }
     }
 
diff --git a/src/main/resources/templates/house/save.html b/src/main/resources/templates/house/save.html
index 4f04b23..184c59d 100644
--- a/src/main/resources/templates/house/save.html
+++ b/src/main/resources/templates/house/save.html
@@ -525,7 +525,7 @@
                             }
                         }
                         if (!exists) {
-                            cohabitArray.push({populationInfoId: list[i].populationInfoId, cardNum: list[i].idcard, phone: list[i].phone, name: list[i].name, outHouse: "0"});
+                            cohabitArray.push({populationId: "xxxx", populationInfoId: list[i].populationInfoId, cardNum: list[i].idcard, phone: list[i].phone, name: list[i].name, outHouse: "0"});
                         }
                     }
                     reloadCohabit();
diff --git a/src/main/resources/templates/house/update.html b/src/main/resources/templates/house/update.html
index 9b09685..e7bb345 100644
--- a/src/main/resources/templates/house/update.html
+++ b/src/main/resources/templates/house/update.html
@@ -401,6 +401,7 @@
             <label class="layui-form-label">姓名</label>
             <div class="layui-input-block">
                 <input type="hidden" class="layui-input" value="{{item.populationInfoId}}" maxLength="255">
+                <input type="hidden" class="layui-input" value="{{item.populationId}}" maxLength="255">
                 <input type="text" readonly class="layui-input" value="{{item.name}}" placeholder="请输入姓名" maxLength="255">
             </div>
         </div>
@@ -808,7 +809,7 @@
                             }
                         }
                         if (!exists) {
-                            cohabitArray.push({populationInfoId: list[i].populationInfoId, cardNum: list[i].idcard, phone: list[i].phone, name: list[i].name, outHouse: "0"});
+                            cohabitArray.push({populationId: "", populationInfoId: list[i].populationInfoId, cardNum: list[i].idcard, phone: list[i].phone, name: list[i].name, outHouse: "0"});
                         }
                     }
                     reloadCohabit();