From 878b7d3bcddaf5bfff49d23796f3473c022853f5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 29 Dec 2023 09:06:56 +0800
Subject: [PATCH] 时间倒叙，不然新打卡的，都要一页一页往下翻
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index 162db88..a12938a 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -166,7 +166,7 @@
<if test="house.room != null and house.room != ''"> and jh.room = #{house.room}</if>
<if test="house.buildingNo != null "> and jh.building_no = #{house.buildingNo}</if>
<if test="house.regionCode != null and house.regionCode !='' ">
- and jda.nei_code like concat('%',#{house.regionCode},'%')
+ and jg.community_code like concat('%',#{house.regionCode},'%')
</if>
</select>
@@ -298,7 +298,7 @@
<if test="aoiCode != null and aoiCode != ''">
and jda.aoi_code=#{aoiCode}
</if>
- <if test="userId != null">
+ <if test="userId != null and roleType == '1'">
AND jda.address_code IN (
SELECT DISTINCT
jgr.house_code
@@ -310,6 +310,16 @@
jgm.user_id = #{userId}
AND jg.is_deleted = 0
)
+ </if>
+ <if test="userId != null and roleType == '3'">
+ AND jda.address_code IN (SELECT
+ jda.address_code
+ FROM
+ jczz_doorplate_address jda
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ WHERE
+ jc.res_police_user_id = #{userId})
+ )
</if>
) a
@@ -342,7 +352,7 @@
<if test="aoiCode != null and aoiCode != ''">
and jda.aoi_code=#{aoiCode}
</if>
- <if test="userId != null">
+ <if test="userId != null and roleType == '1'">
AND jda.address_code IN (
SELECT DISTINCT
jgr.house_code
@@ -353,6 +363,16 @@
WHERE
jgm.user_id = #{userId}
AND jg.is_deleted = 0
+ )
+ </if>
+ <if test="userId != null and roleType == '3'">
+ AND jda.address_code IN (SELECT
+ jda.address_code
+ FROM
+ jczz_doorplate_address jda
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ WHERE
+ jc.res_police_user_id = #{userId})
)
</if>
) a
@@ -382,18 +402,28 @@
<if test="aoiCode != null and aoiCode != ''">
and jda.aoi_code=#{aoiCode}
</if>
- <if test="userId != null">
- AND jda.address_code IN (
- SELECT
- jgr.house_code
- FROM
- jczz_grid jg
- LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
- LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
- WHERE
- jgm.user_id = #{userId}
- AND jg.is_deleted = 0
- )
+ <if test="userId != null and roleType == '1'">
+ AND jda.address_code IN (
+ SELECT DISTINCT
+ jgr.house_code
+ FROM
+ jczz_grid jg
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+ WHERE
+ jgm.user_id = #{userId}
+ AND jg.is_deleted = 0
+ )
+ </if>
+ <if test="userId != null and roleType == '3'">
+ AND jda.address_code IN (SELECT
+ jda.address_code
+ FROM
+ jczz_doorplate_address jda
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ WHERE
+ jc.res_police_user_id = #{userId})
+ )
</if>
</select>
@@ -423,7 +453,7 @@
<if test="aoiCode != null and aoiCode != ''">
and jda.aoi_code=#{aoiCode}
</if>
- <if test="userId != null">
+ <if test="userId != null and roleType == '1'">
AND jda.address_code IN (
SELECT DISTINCT
jgr.house_code
@@ -436,6 +466,16 @@
AND jg.is_deleted = 0
)
</if>
+ <if test="userId != null and roleType == '3'">
+ AND jda.address_code IN (SELECT
+ jda.address_code
+ FROM
+ jczz_doorplate_address jda
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ WHERE
+ jc.res_police_user_id = #{userId})
+ )
+ </if>
) a
--
Gitblit v1.9.3