push

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

@@ -343,10 +343,19 @@ public class ApiCommissionExpectedController {
     @Operation(summary = "应收款报表")
     public Result<ReceivableReportResponse> receivableReport(@RequestBody CommissionExpectedQueryRequest commissionExpectedQueryRequest) {
         //保單持有人（中/英、繁简/大小写）、签单人、转介人名称（主）、受保人（中/英、繁简/大小写）、查询保单号列表
-        List<String> queryPolicyNoList = policyFollowService.queryPolicyNoList(commissionExpectedQueryRequest.getPolicyHolder(),
-                commissionExpectedQueryRequest.getSigner(),
-                commissionExpectedQueryRequest.getBrokerName(),
-                commissionExpectedQueryRequest.getInsured());
+        List<String> queryPolicyNoList = new ArrayList<>();
+        if (StringUtils.isNotBlank(commissionExpectedQueryRequest.getPolicyHolder())
+            || StringUtils.isNotBlank(commissionExpectedQueryRequest.getSigner())
+            || StringUtils.isNotBlank(commissionExpectedQueryRequest.getBrokerName())
+            || StringUtils.isNotBlank(commissionExpectedQueryRequest.getInsured())
+        ){
+            queryPolicyNoList = policyFollowService.queryPolicyNoList(
+                    commissionExpectedQueryRequest.getPolicyHolder(),
+                    commissionExpectedQueryRequest.getSigner(),
+                    commissionExpectedQueryRequest.getBrokerName(),
+                    commissionExpectedQueryRequest.getInsured());
+        }
+
         // 构建查询条件
         commissionExpectedQueryRequest.setPolicyNoList(queryPolicyNoList);
         QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);