修改需求

src/main/resources/config/mapping/PrivateOrderMapper.xml

@@ -295,6 +295,7 @@
                 FROM bus_collection a
                 JOIN bus_supplier_release b ON a.ordering_uuid = b.uuid
                 JOIN bus_private_ordering c ON b.demand_uuid = c.uuid
+                WHERE a.code = #{code}
         )
         <if test="titleTravel != null and titleTravel != ''">
             AND b.offer_name like CONCAT(CONCAT('%', #{titleTravel}), '%')
@@ -307,6 +308,7 @@
         FROM
             bus_collection a
             JOIN bus_supplier_release b ON a.ordering_uuid = b.uuid
+            JOIN bus_private_ordering c ON b.demand_uuid = c.uuid
         WHERE
             a.code = #{code}
             AND a.type = '0'
@@ -369,7 +371,29 @@
                 </if>
             ) f
         WHERE
-            f.id NOT IN ( SELECT TOP ${page} id FROM bus_collection )
+            f.id NOT IN ( SELECT TOP ${page} e.id FROM
+            (
+            SELECT
+                a.id
+            FROM
+                bus_collection a
+                JOIN bus_travel b ON a.ordering_uuid = b.uuid
+                JOIN bus_supplier_release c ON b.demand_uuid = c.uuid
+                JOIN bus_private_ordering d ON c.demand_uuid = d.uuid
+            WHERE
+                a.code = #{code}
+                AND a.type = '1'
+            UNION ALL
+            SELECT
+                a.id
+            FROM
+                bus_collection a
+                JOIN bus_supplier_route b ON a.ordering_uuid = b.uuid
+            WHERE
+                a.code = #{code}
+                AND a.type = '2'
+                ) e ORDER BY e.id
+            )
         ORDER BY
             f.id
     </select>
@@ -384,6 +408,8 @@
                 FROM
                     bus_collection a
                     JOIN bus_travel b ON a.ordering_uuid = b.uuid
+                    JOIN bus_supplier_release c ON b.demand_uuid = c.uuid
+                    JOIN bus_private_ordering d ON c.demand_uuid = d.uuid
                 WHERE
                     a.code = #{code}
                     AND a.type = '1'