From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 3 ++-
1 files changed, 2 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..8a9ebba 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -796,7 +796,7 @@
<!--查询未绑定网格或警格的数据-->
<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>
@@ -833,6 +833,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