From a1d8ea1a72cddf7651742b87f042602ab006c879 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 17:17:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 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 ba422d3..c024934 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -24,6 +24,25 @@
         <if test="placeExt.confirmFlag != null">
             and jpe.confirm_flag = #{placeExt.confirmFlag}
         </if>
+        <if test="placeExt.roleName!=null and placeExt.roleName!=''">
+            <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>
     </select>
 
     <!--自定义详情查询-->

--
Gitblit v1.9.3