From b5837609dcd4417904eaaa5924de46010443affd Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 21 Mar 2024 19:37:45 +0800
Subject: [PATCH] 居住证审核+从业人员优化
---
src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 430029b..a697284 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
@@ -49,11 +49,16 @@
<if test="isAdministrator==2">
<!-- 网格员及其他 -->
- <if test="residen.roleType ==null">
+ <if test="residen.roleType ==null and residen.roleName !='inhabitant'">
<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
+ jtrpa.jw_grid_code in
<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
#{code}
</foreach>
@@ -70,9 +75,6 @@
</foreach>
)
</when>
- <otherwise>
- and jg.grid_code in ('')
- </otherwise>
</choose>
<if test="residen.confirmUserId != null ">
--
Gitblit v1.9.3