From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并,网格员区域树查询修改,解决不显示网格问题

---
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index fa0d197..a9181a9 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -419,7 +419,6 @@
                 and jt.report_type in (5,8)
             </if>
             and jt.is_deleted = 0
-            and jt.house_code is not null
         </where>
     </select>
 
@@ -466,7 +465,7 @@
     <!--取保候审人员查询-->
     <select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
         SELECT
-        IFNULL( jda.address_name, jp.location ) AS address_name,
+        IFNULL( jda.address_name, jh.house_name ) AS address_name,
         jtbre.apply_name,
         jh.district_code aoiCode,
         jda.region_code,
@@ -522,7 +521,7 @@
             </if>
 
             <if test="task.aoiCode != null and task.aoiCode != null">
-                and jgr.district_code = #{task.aoiCode}
+                and jh.district_code = #{task.aoiCode}
             </if>
 
             <if test="task.neiCode != null and task.neiCode != null">

--
Gitblit v1.9.3