From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index fda77a9..36d88cf 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -796,13 +796,14 @@
<!--查询未绑定网格或警格的数据-->
<select id="getNotBindGridOrJwGridList" resultType="org.springblade.modules.house.entity.HouseEntity">
- select lng,lat from jczz_house where is_deleted = 0 and lng != ''
+ select id,lng,lat from jczz_house where is_deleted = 0 and lng != ''
<if test="type == 1">
and grid_code is null
</if>
<if test="type == 2">
and jw_grid_code is null
</if>
+ and create_time > '2024-03-20 11:00:00'
</select>
<!--按房屋标签统计-->
@@ -833,6 +834,7 @@
<if test="house.roleName=='wgy'">
<choose>
<when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jh.grid_code in
<foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
#{code}
</foreach>
--
Gitblit v1.9.3