From 0a7f15457a9c44d5ef19a3234306e84dabbe4fd2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 21 Mar 2024 12:55:25 +0800
Subject: [PATCH] 租客

---
 src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
index 4ea3df1..430029b 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
@@ -49,16 +49,11 @@
 
             <if test="isAdministrator==2">
                 <!-- 网格员及其他 -->
-                <if test="vo.roleType ==null">
+                <if test="residen.roleType ==null">
                     <choose>
                         <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                             and (
                             jg.grid_code in
-                            <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
-                                #{code}
-                            </foreach>
-                            or
-                            jp.grid_code in
                             <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                                 #{code}
                             </foreach>
@@ -73,11 +68,6 @@
                             <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                                 #{code}
                             </foreach>
-                            or
-                            jp.grid_code in
-                            <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
-                                #{code}
-                            </foreach>
                             )
                         </when>
                         <otherwise>
@@ -85,8 +75,8 @@
                         </otherwise>
                     </choose>
 
-                    <if test="vo.confirmUserId != null ">
-                        or jtrfr.confirm_user_id = #{vo.confirmUserId}
+                    <if test="residen.confirmUserId != null ">
+                        or jtrfr.confirm_user_id = #{residen.confirmUserId}
                     </if>
 
                 </if>

--
Gitblit v1.9.3