合并分享

app-hd/controllers/PurchaseController.php

@@ -1048,7 +1048,7 @@ class PurchaseController extends BaseController
         Yii::$app->params['pageSize'] = 9999;
 
         $get = Yii::$app->request->get();
-        $mergeId = $get['mergeId'] ??0;
+        $mergeId = $get['mergeId'] ?? 0;
         if (empty($mergeId)) {
             util::fail('请选择采购单');
         }
@@ -1064,7 +1064,12 @@ class PurchaseController extends BaseController
             if (empty($mergeSn->salt) || $mergeSn->salt != $salt) {
                 util::fail('找不到订单');
             }
+        } else {
+            if ($mergeSn->mainId != $this->mainId) {
+                util::fail('不是你的订单');
+            }
         }
+        $ghsId = $mergeSn->ghsId ?? 0;
         $where = [
             'ghsId' => $ghsId,
             'mergeId' => $mergeId,