From 94ae02e6f73b7011f0fcf6acff8636341d35351d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 17:24:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index f69ea9f..a7453a3 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -381,7 +381,7 @@
Order orderData = orderClient.detail(order.getOrderId()).getData();
- if(orderData.getState()==0 && (!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId()))){
+ if(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId())){
// 修改sys_change_dispatch 为已改派
dispatchClient.changeReason(order.getOrderId(),"");
}
--
Gitblit v1.7.1