From aceacde71011b310b972af4df2d7b70b61769ad6 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 19 Mar 2024 16:14:17 +0800
Subject: [PATCH] 过滤查询问题修复
---
src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml | 4 ++--
src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml | 6 +++---
src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml | 2 +-
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 2 +-
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 4 ++--
src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java | 2 +-
src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
index 0b9d91c..273e3be 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -104,7 +104,7 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
index bd1a7ff..8777b93 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
@@ -375,7 +375,7 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
index 9001fad..0cb0785 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -71,7 +71,7 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
@@ -169,7 +169,7 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index 346f384..fbff911 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -266,7 +266,7 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
@@ -644,7 +644,7 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
diff --git a/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java
index 38a0406..5de2215 100644
--- a/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java
+++ b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java
@@ -45,7 +45,7 @@
@Param("vo") PoliceAlarmRecordsVO policeAlarmRecords,
@Param("isAdministrator") Integer isAdministrator,
@Param("regionChildCodesList") List<String> regionChildCodesList,
- @Param("vo") List<String> gridCodeList);
+ @Param("gridCodeList") List<String> gridCodeList);
}
diff --git a/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
index 0a26fa9..0fab254 100644
--- a/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
@@ -13,7 +13,7 @@
LEFT JOIN jczz_police_affairs_grid jpag on jpar.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
LEFT JOIN blade_region br on br.code = jpag.community_code
<where>
- <if test="vo.status != null ">
+ <if test="vo.status != null">
and jpar.status = #{vo.status}
</if>
<if test="vo.alarmDescribe != null and vo.alarmDescribe != ''">
@@ -71,14 +71,14 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
</otherwise>
</choose>
</if>
- and is_deleted = 0
+ and jpar.is_deleted = 0
</where>
</select>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml
index 96aadd7..a2f62ba 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml
@@ -331,7 +331,7 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
@@ -601,7 +601,7 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
--
Gitblit v1.9.3