20220328_1后端备案预警查询

src/main/java/com/jkcredit/invoice/controller/business/CustomerController.java

@@ -334,10 +334,14 @@ public class CustomerController {
     @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR findCustomerRecTimeList(Page page, CustomerRec customerRec) {
         IPage ipage = null;
-        if(StringUtils.isNotEmpty(customerRec.getServiceEndTime())  && !"null".equals(customerRec.getServiceEndTime())){
+        if((StringUtils.isNotEmpty(customerRec.getServiceEndTime())  && !"null".equals(customerRec.getServiceEndTime()))||
+                (StringUtils.isNotEmpty(customerRec.getCompanyName())  && !"null".equals(customerRec.getCompanyName()))||
+        (StringUtils.isNotEmpty(customerRec.getCompanyBelongName())  && !"null".equals(customerRec.getCompanyBelongName()))){
+            if(StringUtils.isNotEmpty(customerRec.getServiceEndTime())  && !"null".equals(customerRec.getServiceEndTime())){
             String [] res =customerRec.getServiceEndTime().split(",");
             customerRec.setServiceEndTimeStart(res[0]);
             customerRec.setServiceEndTimeEnd(res[1].replace("00:00:00","23:59:59"));
+            }
             ipage = customerRecService.findAllCustomerRecWarning(page, customerRec);
         }else{
             Param param = paramService.getParamsByParamName("CUST_EARLY_WARNING");