o2o配送列表

6d0fc334 · 郭勇志 · b3eef114 · 6d0fc334
Commit 6d0fc334 authored Dec 20, 2019 by 郭勇志
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

O2oDeliveryController.php backend/controllers/v1/transport/O2oDeliveryController.php +5 -0

No files found.
--- a/backend/controllers/v1/transport/O2oDeliveryController.php
+++ b/backend/controllers/v1/transport/O2oDeliveryController.php
@@ -64,6 +64,10 @@ class O2oDeliveryController extends BaseController
                    $branchGuid=$userInfo['BRANCH_GUID'];
                    $parentBranchGuid='';
                    break;
+                default:
+                    $branchGuid='';
+                    $parentBranchGuid='';
+                    break;
            }
            $infoArr = $model->find()
                    ->alias('scds')
@@ -282,6 +286,7 @@ class O2oDeliveryController extends BaseController
                $result = ArrayHelper::index($settingInfo, 'BRANCH_GUID');
             
                $transaction=$scdsImport->getDb()->beginTransaction();
+                //置空不再验证此属性
                $scdsImport->branchCodeArr = [];
                try {
                    foreach ($tempArr as $key => $valueB) {