From 576e1f22702f031384dbc403bb6d2580a5d08d80 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 17:06:27 +0800
Subject: [PATCH] 取保候审优化

---
 src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java |    2 +-
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml                               |    3 +--
 2 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 72f1ae0..13bf473 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -187,8 +187,7 @@
         jczz_task jt
         LEFT JOIN jczz_house jh ON jt.house_code=jh.house_code and jh.is_deleted = 0
         LEFT JOIN blade_user bu on bu.id = jt.create_user and bu.is_deleted = 0
-        LEFT JOIN jczz_grid_range jgr on jgr.house_code= jt.house_code
-        LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+        LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
         LEFT JOIN blade_region br on br.code = jg.community_code
         <where>
             <if test="task.roleName != null and task.roleName != ''">
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
index 3fde6c2..447644a 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
@@ -57,7 +57,7 @@
 			1, bailReporting.getApplyName(),
 			AuthUtil.getUserId(),
 			bailReporting.getHouseCode(),
-			bailReporting.getReportType(),0);
+			bailReporting.getReportType(),1);
 		if (aLong > 0) {
 			bailReporting.setTaskId(aLong);
 			bailReporting.setCheckUserId(AuthUtil.getUserId());

--
Gitblit v1.9.3