前端对接问题修复31

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

@@ -536,8 +536,8 @@ public class ApiCommissionController {
         long size = commissionQueryRequest.getPageSize();
         long size = commissionQueryRequest.getPageSize();
         // 查询列表数据
         // 查询列表数据
         QueryWrapper<Commission> queryWrapper = new QueryWrapper<>();
         QueryWrapper<Commission> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("commission_expected_biz_id", commissionQueryRequest.getCommissionExpectedBizId());
-        queryWrapper.eq("reconciliation_year_month", commissionQueryRequest.getReconciliationYearMonth());
+        queryWrapper.eq(ObjectUtils.isNotEmpty(commissionQueryRequest.getCommissionExpectedBizId()),"commission_expected_biz_id", commissionQueryRequest.getCommissionExpectedBizId());
+        queryWrapper.eq(ObjectUtils.isNotEmpty(commissionQueryRequest.getReconciliationYearMonth()),"reconciliation_year_month", commissionQueryRequest.getReconciliationYearMonth());
         Page<Commission> commissionPage = commissionService.page(new Page<>(current, size),
         Page<Commission> commissionPage = commissionService.page(new Page<>(current, size),
                 queryWrapper);
                 queryWrapper);
         // 组装返回值
         // 组装返回值