diff --git a/src/main/java/com/biutag/supervision/service/RpcApplyService.java b/src/main/java/com/biutag/supervision/service/RpcApplyService.java index c7aa432..71fcb76 100644 --- a/src/main/java/com/biutag/supervision/service/RpcApplyService.java +++ b/src/main/java/com/biutag/supervision/service/RpcApplyService.java @@ -76,7 +76,7 @@ public class RpcApplyService extends ServiceImpl { } } queryWrapper.like(StrUtil.isNotBlank(queryParam.getApplicantEmpName()), "a.applicant_emp_name", queryParam.getApplicantEmpName()) - .eq(StrUtil.isNotBlank(queryParam.getDepartId()), "a.depart_id", queryParam.getDepartId()) + .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"); @@ -114,7 +114,7 @@ public class RpcApplyService extends ServiceImpl { } } queryWrapper.like(StrUtil.isNotBlank(queryParam.getApplicantEmpName()), "a.applicant_emp_name", queryParam.getApplicantEmpName()) - .eq(StrUtil.isNotBlank(queryParam.getDepartId()), "a.depart_id", queryParam.getDepartId()) + .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())