1

app/admin/controller/article/Article.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller\article;
 
 use app\admin\controller\AuthController;
+use app\admin\model\system\SystemAdmin;
 use app\admin\model\system\SystemAttachment;
 use crmeb\services\{
     UtilService as Util, JsonService as Json
@@ -31,6 +32,11 @@ class Article extends AuthController
             ['title', ''],
             ['cid', $this->request->param('pid', '')],
         ], $this->request);
+        $admin_id=$this->adminId;
+        $mer_id = SystemAdmin::where('id', $admin_id)->value('mer_id');
+        if ($mer_id>0){
+            $where['mer_id'] = $mer_id;
+        }
         $this->assign('where', $where);
         $where['merchant'] = 0;//区分是管理员添加的图文显示  0 还是 商户添加的图文显示  1
         $tree = sort_list_tier(ArticleCategoryModel::getArticleCategoryList());
@@ -62,6 +68,11 @@ class Article extends AuthController
         $news['synopsis'] = '';
         $news['url'] = '';
         $news['cid'] = [];
+        $admin_id=$this->adminId;
+        $mer_id = SystemAdmin::where('id', $admin_id)->value('mer_id');
+        if ($mer_id>0){
+            $news['mer_id'] = $mer_id;
+        }
         $select = 0;
         if ($id) {
             $news = ArticleModel::where('n.id', $id)->alias('n')->field('n.*,c.content')->join('ArticleContent c', 'c.nid=n.id', 'left')->find();
@@ -122,6 +133,8 @@ class Article extends AuthController
         $data['cid'] = implode(',', $data['cid']);
         $content = $data['content'];
         unset($data['content']);
+        $admin_id = $this->request->param('admin_id');
+        $data['mer_id'] = SystemAdmin::where('id', $admin_id)->value('mer_id');
         if ($data['id']) {
             $id = $data['id'];
             unset($data['id']);

app/admin/controller/order/StoreOrder.php

@@ -71,6 +71,11 @@ class StoreOrder extends AuthController
             ['pay_type', ''],
             ['order', '']
         ]);
+        $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::successful(StoreOrderModel::getBadge($where));
     }
 
@@ -94,7 +99,9 @@ class StoreOrder extends AuthController
         ]);
         $admin_id=$this->adminId;
         $mer_id = SystemAdmin::where('id', $admin_id)->value('mer_id');
-        $where['mer_id'] = $mer_id;
+        if ($mer_id>0){
+            $where['mer_id'] = $mer_id;
+        }
         return Json::successlayui(StoreOrderModel::OrderList($where));
     }
 

app/admin/model/order/StoreOrder.php

@@ -73,7 +73,6 @@ class StoreOrder extends BaseModel
         } else {
             $data = ($data = $model->page((int)$where['page'], (int)$where['limit'])->select()) && count($data) ? $data->toArray() : [];
         }
-
         foreach ($data as &$item) {
             $_info = StoreOrderCartInfo::where('oid', $item['id'])->field('cart_info')->select();
             $_info = count($_info) ? $_info->toArray() : [];
@@ -532,6 +531,9 @@ HTML;
         if (isset($where['data']) && $where['data'] !== '') {
             $model = self::getModelTime($where, $model, $aler . 'add_time');
         }
+        if(isset($where['mer_id']) && $where['mer_id'] !== ''){
+            $model = $model->where('mer_id',$where['mer_id']);
+        }
         return $model;
     }