补充是否外部仓部分sql条件

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -752,7 +752,9 @@
         <if test="query.productRecord != null">
             AND o.`product_record` = #{query.productRecord}
         </if>
-
+        <if test="query.isExternalWarehouse != null">
+            AND o.`is_external_warehouse` = #{query.isExternalWarehouse}
+        </if>
         <if test="query.transportId != null">
             AND o.`transport_id` = #{query.transportId}
         </if>
@@ -1257,6 +1259,9 @@
         <if test="query.customerId != null">
             AND o.`customer_id` = #{query.customerId}
         </if>
+        <if test="query.isExternalWarehouse != null">
+            AND o.`is_external_warehouse` = #{query.isExternalWarehouse}
+        </if>
         <if test="query.beginRucangTime != null and query.endRucangTime != null ">
             AND o.`rucang_time` between #{query.beginRucangTime} and #{query.endRucangTime}
         </if>
@@ -2387,6 +2392,9 @@
         <if test="query.orderNo != null and query.orderNo != '' ">
             AND o.`order_no` like concat("%",concat(#{query.orderNo},"%"))
         </if>
+        <if test="query.isExternalWarehouse != null">
+            AND o.`is_external_warehouse` = #{query.isExternalWarehouse}
+        </if>
         <if test="query.orderIdList != null and query.orderIdList.size() != 0">
             AND o.`order_id` in
             <foreach item='orderId' index='index' collection='query.orderIdList' open='(' separator=',' close=')'>

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/order/OrderController.java

@@ -331,7 +331,7 @@ public class OrderController {
 //    @PreAuthorize("@ss.hasPermission('ecw:order:query')")
     public CommonResult<PageResult<OrderBackPageVO>> getOrderPage(OrderQueryVO query, PageVO page) {
         query.setUserType(UserTypeEnum.ADMIN.getValue());
-        PageResult<OrderBackPageVO> pageResult = orderQueryService.myOrderPage(query, page);
+        PageResult<OrderBackPageVO> pageResult = orderQueryService.orderPage(query, page);
         return success(pageResult);
     }