fix--维权抚慰查询支持二级查三级

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<RpcApplyMapper, RpcApply> {
             }
         }
         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<RpcApplyMapper, RpcApply> {
             }
         }
         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));
         }