From 2764ead2da0ef0a6c598180ae708e1c189e26fba Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 28 Jun 2023 12:13:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=95=86=E5=AE=B6=E5=AF=84=E4=BB=B6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/StoreOrderServices.php             | 4 ++--
 .../system/attachment/SystemAttachmentCategoryServices.php  | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index b50170b72..936b54509 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -2689,7 +2689,7 @@ HTML;
         }
 
         //发起取消商家寄件
-        $res = app()->make(ServeServices::class)->express()->shipmentCancelOrder([
+        app()->make(ServeServices::class)->express()->shipmentCancelOrder([
             'task_id' => $orderInfo->kuaidi_task_id,
             'order_id' => $orderInfo->kuaidi_order_id,
             'cancel_msg' => $msg,
@@ -2717,7 +2717,7 @@ HTML;
             $orderInfo->save();
         });
 
-        return $res;
+        return true;
     }
 
     public function checkSubOrderNotSend(int $pid, int $order_id)
diff --git a/crmeb/app/services/system/attachment/SystemAttachmentCategoryServices.php b/crmeb/app/services/system/attachment/SystemAttachmentCategoryServices.php
index a1ece2c55..d46b05aad 100644
--- a/crmeb/app/services/system/attachment/SystemAttachmentCategoryServices.php
+++ b/crmeb/app/services/system/attachment/SystemAttachmentCategoryServices.php
@@ -54,8 +54,10 @@ class SystemAttachmentCategoryServices extends BaseServices
         } else {
             foreach ($list as &$item) {
                 $item['title'] = $item['name'];
-                $item['children'] = [];
-                if ($where['name'] == '' && $this->dao->count(['pid' => $item['id']])) $item['loading'] = false;
+                if ($where['name'] == '' && $this->dao->count(['pid' => $item['id']])) {
+                    $item['loading'] = false;
+                    $item['children'] = [];
+                }
             }
         }
         return compact('list');