From 5745a87f3a139ea2bbdaf4704978e4c151ecc45a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jan 2024 17:39:48 +0800
Subject: [PATCH] 物业管理管和项目经理数据过滤

---
 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 deletions(-)

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 45dab58..d6a1888 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -17,18 +17,31 @@
         jp.place_name AS placeName
         FROM
         jczz_place_ext jpe
-        LEFT JOIN jczz_place jp ON jpe.place_id = jp.id
-        AND jp.is_deleted = 0
-        LEFT JOIN jczz_grid_range jgr on jgr.house_code=jp.house_code
-        LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
+        LEFT JOIN jczz_place jp ON jpe.place_id = jp.id AND jp.is_deleted = 0
+        LEFT JOIN jczz_grid jg ON jp.grid_code = jg.grid_code AND jg.is_deleted = 0
         WHERE
         jpe.is_deleted = 0
-        <if test="placeExt.communityCode != null and placeExt.communityCode != ''">
-            and jg.community_code=#{placeExt.communityCode}
+        <if test="isAdministrator==2">
+            <choose>
+                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+                    and jg.community_code in
+                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+                        #{code}
+                    </foreach>
+                </when>
+                <otherwise>
+                    and jg.community_code in ('')
+                </otherwise>
+            </choose>
         </if>
-
         <if test="placeExt.placeName != null and placeExt.placeName != ''">
             and jp.place_name like concat('%',#{placeExt.placeName},'%')
+        </if>
+        <if test="placeExt.placeId != null">
+            and jp.id = #{placeExt.placeId}
+        </if>
+        <if test="placeExt.isApp != null">
+            and jpe.confirm_flag != 4
         </if>
         <if test="placeExt.houseCode != null and placeExt.houseCode != ''">
             and jp.house_code = #{placeExt.houseCode}
@@ -39,24 +52,11 @@
         <if test="placeExt.startTime != null and placeExt.startTime != '' and placeExt.endTime != null and placeExt.endTime != '' ">
             AND jpe.create_time BETWEEN #{placeExt.startTime} and #{placeExt.endTime}
         </if>
-        <if test="placeExt.roleName!=null and placeExt.roleName!='' and placeExt.createUser!=null">
-            <choose>
-                <when test="placeExt.roleName=='网格员'">
-                    and
-                    (
-                    jp.create_user = #{placeExt.createUser}
-                    <if test="houseCodeList != null and houseCodeList.size()>0">
-                        or jp.house_code in
-                        <foreach collection="houseCodeList" item="houseCode" separator="," open="(" close=")">
-                            #{houseCode}
-                        </foreach>
-                    </if>
-                    )
-                </when>
-                <otherwise>
-                    and jp.principal_user_id = #{placeExt.createUser}
-                </otherwise>
-            </choose>
+        <if test="houseCodeList != null and houseCodeList.size()>0">
+            and jp.house_code in
+            <foreach collection="houseCodeList" item="houseCode" separator="," open="(" close=")">
+                #{houseCode}
+            </foreach>
         </if>
         order by jpe.create_time desc,jpe.id desc
     </select>

--
Gitblit v1.9.3