From 9e762b5593afd830c420cc8c2fdfe6cdb9452438 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Mon, 25 Dec 2023 16:21:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=88=BF=E5=8F=B7=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=BD=95=E5=85=A5=20=20--renpc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/house/impl/HouseServiceImpl.java    | 13 ++++++++++---
 .../mybatis/mapper/house/house-mapper.xml       | 17 +++++++++++++----
 2 files changed, 23 insertions(+), 7 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 6a17ce6..5cb91c3 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
@@ -1,6 +1,7 @@
 package com.cm.population.service.house.impl;
 
 import com.cm.common.base.AbstractService;
+import com.cm.common.exception.SaveException;
 import com.cm.common.pojo.ListPage;
 import com.cm.common.pojo.bos.UserInfoBO;
 import com.cm.common.result.SuccessResultList;
@@ -26,6 +27,7 @@ import com.cm.population.service.residential.IResidentialService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.pdfbox.contentstream.operator.state.Save;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -86,10 +88,15 @@ public class HouseServiceImpl extends AbstractService implements IHouseService {
         } else {
             setSaveInfo(token, params);
         }
-        houseDao.save(params);
 
-        // 2023年11月20日15:38:06 崔宝铖 创建saveAll函数
-        populationService.saveAll(token, houseId, houseVO.getPopulationVOList(), true);
+        // 查询当前房间信息是否存在，存在则不做操作
+        Integer count = houseDao.count(params);
+        if(count <= 0) {
+            houseDao.save(params);
+
+            // 2023年11月20日15:38:06 崔宝铖 创建saveAll函数
+            populationService.saveAll(token, houseId, houseVO.getPopulationVOList(), true);
+        }
 
         return houseId;
     }
diff --git a/src/main/resources/mybatis/mapper/house/house-mapper.xml b/src/main/resources/mybatis/mapper/house/house-mapper.xml
index 4ee6a61..2084112 100644
--- a/src/main/resources/mybatis/mapper/house/house-mapper.xml
+++ b/src/main/resources/mybatis/mapper/house/house-mapper.xml
@@ -965,6 +965,15 @@
         SELECT COUNT(*)
         FROM house_house t1
         WHERE t1.is_delete = 0
+        <if test="buildingId != null and buildingId != ''">
+            AND building_id = #{buildingId}
+        </if>
+        <if test="affiliationFloors != null and affiliationFloors != ''">
+            AND affiliation_floors = #{affiliationFloors}
+        </if>
+        <if test="affiliationUnit != null and affiliationUnit != ''">
+            AND affiliation_unit = #{affiliationUnit}
+        </if>
     </select>
 
     <!-- 以房找人列表 -->
@@ -1124,10 +1133,10 @@
         t1.is_delete = 0
         <if test="houseIds != null and houseIds.size > 0">
             AND
-                house_id IN
-                <foreach collection="houseIds" index="index" open="(" separator="," close=")">
-                    #{houseIds[${index}]}
-                </foreach>
+            house_id IN
+            <foreach collection="houseIds" index="index" open="(" separator="," close=")">
+                #{houseIds[${index}]}
+            </foreach>
         </if>
     </select>