FengChaoYu преди 5 месеца
родител
ревизия
34b5b2103a
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

+ 1 - 1
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -678,7 +678,7 @@ public class OrderBaseLogic {
         String workerId;
         if (Objects.isNull(orderBase)) {
             orderBase = pgOrderBaseService.getById(orderBaseId);
-            if (StringUtils.equals(orderBase.getOrderStatus(), OrderBaseStatusEnum.YWG.getKey())) {
+            if (!orderBase.getIsImportExcel() && StringUtils.equals(orderBase.getOrderStatus(), OrderBaseStatusEnum.YWG.getKey())) {
                 throw new RemoteServiceException("工单状态”已完工“");
             }
             workerId = orderBase.getWorkerId();