From db8e73b120963810d6febdb939612db12d26996e Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期四, 18 十二月 2025 14:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java b/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
index de9eb14..e09c216 100644
--- a/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
+++ b/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
@@ -55,7 +55,9 @@
public TableDataInfo costList(TmsDispatchOrder tmsDispatchOrder)
{
startPage();
- tmsDispatchOrder.setInStatusList(Arrays.asList(2,3,4,6,7,8,9));
+ if (tmsDispatchOrder.getInStatusList() == null || tmsDispatchOrder.getInStatusList().isEmpty()){
+ tmsDispatchOrder.setInStatusList(Arrays.asList(2,3,4,6,7,8,9));
+ }
List<TmsDispatchOrder> list = tmsDispatchOrderService.selectTmsDispatchOrderList(tmsDispatchOrder);
return getDataTable(list);
}
--
Gitblit v1.8.0