1

app/admin/controller/store/StoreProduct.php

@@ -22,9 +22,7 @@ use crmeb\services\{
 };
 use crmeb\traits\CurdControllerTrait;
 use think\facade\Route as Url;
-use app\admin\model\system\{
-    SystemAttachment, ShippingTemplates
-};
+use app\admin\model\system\{SystemAdmin, SystemAttachment, ShippingTemplates};
 
 
 /**
@@ -84,6 +82,12 @@ class StoreProduct extends AuthController
             ['order', ''],
             ['type', $this->request->param('type')]
         ]);
+        $admin_id=$this->adminId;
+       $mer_id = SystemAdmin::where('id',$admin_id)->value('mer_id');
+       if ($mer_id>0){
+           $where['mer_id'] = $mer_id;
+       }
+
         return Json::successlayui(ProductModel::ProductList($where));
     }
 
@@ -277,6 +281,11 @@ class StoreProduct extends AuthController
             ['activity', []],
             ['store_type', 1]
         ], $this->request, false, true);
+        $admin_id=$this->adminId;
+        $mer_id = SystemAdmin::where('id',$admin_id)->value('mer_id');
+        if ($mer_id>0){
+            $data['mer_id'] = $mer_id;
+        }
         foreach ($data['activity'] as $k => $v) {
             if ($v == '秒杀') {
                 $data['activity'][$k] = 1;

app/admin/model/store/StoreProduct.php

@@ -131,6 +131,9 @@ class StoreProduct extends BaseModel
             } else {
                 $model = $model->order('p.sort desc,p.id desc');
             }
+            if (isset($where['mer_id'])&& $where['mer_id'] != ''){
+                $model = $model->where('mer_id', $where['mer_id']);
+            }
         }
         return $model;
     }