Просмотр исходного кода

Merge branch 'master' into dev

shizhongqi 4 месяцев назад
Родитель
Сommit
4f125c4ac0
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      biz-ghs/order/classes/OrderClass.php

+ 1 - 1
biz-ghs/order/classes/OrderClass.php

@@ -1429,7 +1429,7 @@ class OrderClass extends BaseClass
         $grouped = [];
         $grouped = [];
         foreach ($orderList as $orderInfo) {
         foreach ($orderList as $orderInfo) {
             $distId = intval($orderInfo['distId']);
             $distId = intval($orderInfo['distId']);
-            if (!isset($grouped[$distId])) {
+            if (!isset($grouped[$distId]) && isset($distMap[$distId])) {
                 $grouped[$distId] = [
                 $grouped[$distId] = [
                     'distId' => $distId,
                     'distId' => $distId,
                     'distName' => $distMap[$distId]['name'],
                     'distName' => $distMap[$distId]['name'],