From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/mapper/HouseMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
index 6356f13..4eede44 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
@@ -48,6 +48,7 @@
 	List<HouseVO> selectHousePage(IPage page,
 								  @Param("house") HouseVO house,
 								  @Param("regionChildCodesList") List<String> regionChildCodesList,
+								  @Param("gridCodeList") List<String> gridCodeList,
 								  @Param("isAdministrator") Integer isAdministrator);
 
 	/**
@@ -102,4 +103,11 @@
 								@Param("regionChildCodesList") List<String> regionChildCodesList,
 								@Param("isAdministrator") Integer isAdministrator,
 								@Param("streetCode") String streetCode);
+
+	/**
+	 * 查询未绑定网格或警格的数据
+	 * @param type 1:网格  2:警格
+	 * @return
+	 */
+	List<HouseEntity> getNotBindGridOrJwGridList(@Param("type") Integer type);
 }

--
Gitblit v1.9.3