From 0f3df3b65a13b863726535301cc63c0cbcee8806 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 14 五月 2025 14:20:46 +0800 Subject: [PATCH] bug修改 --- 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 98e339a..da824d4 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 @@ -382,7 +382,7 @@ Order orderData = orderClient.detail(order.getOrderId()).getData(); - if(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId())){ + if(order.getTime()!=null&& order.getServerId()!=null&&(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId()))){ // 修改sys_change_dispatch 为已改派 dispatchClient.changeReason(order.getOrderId(),""); } -- Gitblit v1.7.1