Merge remote-tracking branch 'origin/test' into test

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

@@ -552,7 +552,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         // 应付款报表分页查询 - 按保单号和期数维度统计
         // 应付款报表分页查询 - 按保单号和期数维度统计
         Page<PayableReportVO> reportPage = new Page<>(request.getPageNo(), request.getPageSize());
         Page<PayableReportVO> reportPage = new Page<>(request.getPageNo(), request.getPageSize());
         IPage<PayableReportVO> payableReportPage = new Page<>(request.getPageNo(), request.getPageSize());
         IPage<PayableReportVO> payableReportPage = new Page<>(request.getPageNo(), request.getPageSize());
-        if (CollectionUtils.isEmpty(allFortuneIdList)) {
+        if (!CollectionUtils.isEmpty(allFortuneIdList)) {
             payableReportPage = iExpectedFortuneService.payableReportPage(reportPage, allFortuneIdList);
             payableReportPage = iExpectedFortuneService.payableReportPage(reportPage, allFortuneIdList);
         }
         }
 
 

yd-csf-service/src/main/java/com/yd/csf/service/vo/PayableReportVO.java

@@ -85,7 +85,7 @@ public class PayableReportVO {
     /**
     /**
      * 应出账金额（港币）
      * 应出账金额（港币）
      */
      */
-    @Schema(description = "出账金额（港币）")
+    @Schema(description = "应出账金额（港币）")
     private BigDecimal hkdAmount;
     private BigDecimal hkdAmount;
 
 
     /**
     /**