新单跟进109

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

@@ -86,8 +86,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         }
         }
         // 查询预计入账日期及之前的记录, 关联查询 commission_expected 表
         // 查询预计入账日期及之前的记录, 关联查询 commission_expected 表
         if (expectedDate != null) {
         if (expectedDate != null) {
-            queryWrapper.inSql("c.commission_expected_biz_id",
-                    "SELECT commission_expected_biz_id FROM commission_expected WHERE commission_date <= " + DateUtil.format(expectedDate, "yyyy-MM-dd"));
+            queryWrapper.apply("EXISTS (SELECT 1 FROM commission_expected ce WHERE ce.commission_expected_biz_id = commission.commission_expected_biz_id AND ce.commission_date <= {0})",
+                            expectedDate);
         }
         }
 
 
         queryWrapper.orderByDesc("id");
         queryWrapper.orderByDesc("id");