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 @@