From 9ef0470945cd16a9ed8d2c80088e9a52159dddee Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 05 Dec 2023 10:41:47 +0800
Subject: [PATCH] 修改网格表的userId
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 5 ++---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 29 ++++++++++++++++++++---------
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 4 ++--
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 4 ++--
4 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
index 54b12d8..5f37093 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -135,8 +135,8 @@
</if>
<if test="article.districtId != null and article.districtId != ''">
- and ja.article_range like concat('%',#{article.districtId},'%')
- or ja.article_range is null
+ and (ja.article_range like concat('%',#{article.districtId},'%')
+ or ja.article_range is null)
</if>
</if>
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
index 1053ff7..e125ce7 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -50,15 +50,26 @@
<!--根据地址编号查询网格数据-->
<select id="getGridDetailByParam" resultType="org.springblade.modules.grid.vo.GridVO">
- select jg.id,jg.grid_name,jg.community_name,sort,
- bu.real_name as realName,bu.phone as gridPhone
- from jczz_grid jg
- left join jczz_grid_range jgr on jg.id = jgr.grid_id
- left join jczz_place_rel jpr on locate(jpr.community_name,jg.community_name)>0 and locate(jpr.grid_name,jg.grid_name)>0 and jpr.is_deleted = 0
- left join blade_user bu on bu.id = jg.user_id and bu.is_deleted = 0
- where jg.is_deleted = 0
- and jpr.place_id = #{place.id}
- limit 1
+ SELECT
+ jg.id,
+ jg.grid_name,
+ jg.community_name,
+ sort,
+ bu.real_name AS realName,
+ bu.phone AS gridPhone
+ FROM
+ jczz_grid jg
+ LEFT JOIN jczz_gridman jgm on jg.id = jgm.grid_id
+ LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_place_rel jpr ON locate( jpr.community_name, jg.community_name )> 0
+ AND locate( jpr.grid_name, jg.grid_name )> 0
+ AND jpr.is_deleted = 0
+ LEFT JOIN blade_user bu ON bu.id = jgm.user_id
+ AND bu.is_deleted = 0
+ WHERE
+ jg.is_deleted = 0
+ and jpr.place_id = #{place.id}
+ limit 1
</select>
<!--自定义详情查询-->
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 a6e9c26..a52d157 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -283,12 +283,12 @@
FROM
jczz_grid_range jgr
LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm on jg.id = jgm.grid_id
LEFT JOIN jczz_house_rental jhr on jhr.house_code=jgr.house_code
WHERE
jg.is_deleted = 0
and jhr.audit_status = 0
- AND jg.user_id = #{userId}
-
+ AND jgm.user_id = #{userId}
</select>
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index f4d75a3..df71813 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -183,18 +183,17 @@
<select id="statistics" resultType="java.lang.Integer">
-
SELECT
count(1)
FROM
jczz_grid_range jgr
LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm on jg.id = jgm.grid_id
LEFT JOIN jczz_household jh on jh.house_code=jgr.house_code
WHERE
jg.is_deleted = 0
and jh.confirm_flag = 0
- AND jg.user_id = #{userId}
-
+ AND jgm.user_id = #{userId}
</select>
<!--查询物业-->
--
Gitblit v1.9.3