From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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..008a099 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -466,7 +466,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 +522,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