push

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java

@@ -344,6 +344,7 @@ public class ApiCommissionExpectedController {
     public Result<ReceivableReportResponse> receivableReport(@RequestBody CommissionExpectedQueryRequest commissionExpectedQueryRequest) {
         //保單持有人（中/英、繁简/大小写）、签单人、转介人名称（主）、受保人（中/英、繁简/大小写）、查询保单号列表
         List<String> queryPolicyNoList = new ArrayList<>();
+        Boolean queryFlag = false;
         if (StringUtils.isNotBlank(commissionExpectedQueryRequest.getPolicyHolder())
             || StringUtils.isNotBlank(commissionExpectedQueryRequest.getSigner())
             || StringUtils.isNotBlank(commissionExpectedQueryRequest.getBrokerName())
@@ -354,10 +355,12 @@ public class ApiCommissionExpectedController {
                     commissionExpectedQueryRequest.getSigner(),
                     commissionExpectedQueryRequest.getBrokerName(),
                     commissionExpectedQueryRequest.getInsured());
+            queryFlag = true;
         }
         log.info("应收款报表=>receivableReport=>queryPolicyNoList:{}",JSON.toJSONString(queryPolicyNoList));
         // 构建查询条件
         commissionExpectedQueryRequest.setPolicyNoList(queryPolicyNoList);
+        commissionExpectedQueryRequest.setQueryFlag(queryFlag);
         QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);
 
         // 先查询所有符合条件的记录ID（用于统计）

yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionExpectedQueryRequest.java

@@ -105,4 +105,6 @@ public class CommissionExpectedQueryRequest extends PageDto {
 
 
     private List<String> policyNoList;
+
+    private Boolean queryFlag;
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java

@@ -638,9 +638,11 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         if (CollectionUtils.isNotEmpty(commissionExpectedQueryRequest.getPolicyNoList())) {
             queryWrapper.in(CollectionUtils.isNotEmpty(commissionExpectedQueryRequest.getPolicyNoList()),"policy_no",commissionExpectedQueryRequest.getPolicyNoList());
         }else {
+            if (commissionExpectedQueryRequest.getQueryFlag()) {
                 //查询不到数据
                 queryWrapper.apply("1=0");
             }
+        }
 
         // 范围查询
         queryWrapper.ge(ObjectUtils.isNotEmpty(commissionDateStart), "commission_date", commissionDateStart);