From 46077f0bfa7521e3d62e8aa3a30266fbb414e83f Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Fri, 27 Feb 2026 14:19:00 +0800 Subject: [PATCH] =?UTF-8?q?fix--=E7=BB=B4=E6=9D=83=E6=8A=9A=E6=85=B0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81=E4=BA=8C=E7=BA=A7=E6=9F=A5?= =?UTF-8?q?=E4=B8=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/biutag/supervision/service/RpcApplyService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/biutag/supervision/service/RpcApplyService.java b/src/main/java/com/biutag/supervision/service/RpcApplyService.java index 71fcb76..c12c7f9 100644 --- a/src/main/java/com/biutag/supervision/service/RpcApplyService.java +++ b/src/main/java/com/biutag/supervision/service/RpcApplyService.java @@ -34,6 +34,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import java.time.LocalDateTime; @@ -76,10 +77,12 @@ public class RpcApplyService extends ServiceImpl { } } queryWrapper.like(StrUtil.isNotBlank(queryParam.getApplicantEmpName()), "a.applicant_emp_name", queryParam.getApplicantEmpName()) - .in(StrUtil.isNotBlank(queryParam.getDepartId()), "a.depart_id",departService.getAllNodeIds(queryParam.getDepartId())) .eq("a.type", type) .eq(StrUtil.isNotBlank(queryParam.getRpcStatus()), "a.rpc_status", queryParam.getRpcStatus()) .orderByDesc("a.crt_time"); + if (StrUtil.isNotBlank(queryParam.getDepartId())){ + queryWrapper.in(StrUtil.isNotBlank(queryParam.getDepartId()), "a.depart_id",departService.getAllNodeIds(queryParam.getDepartId())); + } if (queryParam.getApplyDate() != null && queryParam.getApplyDate().size() == 2) { queryWrapper.between("a.apply_date", queryParam.getApplyDate().get(0), queryParam.getApplyDate().get(1)); } @@ -114,12 +117,14 @@ public class RpcApplyService extends ServiceImpl { } } queryWrapper.like(StrUtil.isNotBlank(queryParam.getApplicantEmpName()), "a.applicant_emp_name", queryParam.getApplicantEmpName()) - .in(StrUtil.isNotBlank(queryParam.getDepartId()), "a.depart_id",departService.getAllNodeIds(queryParam.getDepartId())) .eq("a.type", type) .eq(StrUtil.isNotBlank(queryParam.getCaseType()),"a.case_type",queryParam.getCaseType()) .like(StrUtil.isNotBlank(queryParam.getCaseCategory()),"a.case_category",queryParam.getCaseCategory()) .eq(StrUtil.isNotBlank(queryParam.getRpcStatus()), "a.rpc_status", queryParam.getRpcStatus()) .orderByDesc("a.crt_time"); + if (StrUtil.isNotBlank(queryParam.getDepartId())){ + queryWrapper.in(StrUtil.isNotBlank(queryParam.getDepartId()), "a.depart_id",departService.getAllNodeIds(queryParam.getDepartId())); + } if (queryParam.getApplyDate() != null && queryParam.getApplyDate().size() == 2) { queryWrapper.between("a.apply_date", queryParam.getApplyDate().get(0), queryParam.getApplyDate().get(1)); }