【update】行程单查询修改

src/main/java/com/chint/manage/entity/query/ItineraryPageQuery.java

@@ -13,7 +13,7 @@ public class ItineraryPageQuery extends BaseQuery {
     private String applicant="";// 申请人
     private String actualOrderNo=""; //申请单号
     private List<String> userIds=new ArrayList<>();
-    private List<Long> routeIds;
+    private List<Long> routeIds=new ArrayList<>();
 
 
     public String getActualOrderNo() {

src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java

@@ -46,8 +46,11 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
     @Override
     public Page<ItineraryPageDto> itineraryPageQueryByDto(ItineraryPageQuery dto) {
         String query = "SELECT * FROM route_order "
-                + "WHERE route_id IN (:routeIds) "
-                + "AND actual_order_no IS NOT NULL ";
+                + "WHERE actual_order_no IS NOT NULL ";
+
+        if (!dto.getRouteIds().isEmpty()) {
+            query+="AND route_id IN (:routeIds) ";
+        }
 
         if (!dto.getUserIds().isEmpty()) {
             query+="AND user_id IN (:userIds) ";