合并分支 'heshupeng' 到 'master'

Heshupeng



查看合并请求 !415

@@ -17,8 +17,8 @@ class Litestoreorder extends Backend
      * @var \app\admin\model\Litestoreorder
      * @var \app\admin\model\Litestoreorder
      */
      */
     protected $model = null;
     protected $model = null;
-    protected $dataLimit = true;
-    protected $dataLimitField = 'store_id';
+//    protected $dataLimit = true;
+//    protected $dataLimitField = 'store_id';
 
 
     public function _initialize()
     public function _initialize()
     {
     {
@@ -54,13 +54,19 @@ class Litestoreorder extends Backend
                 return $this->selectpage();
                 return $this->selectpage();
             }
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $store = \app\admin\model\store\Store::where('admin_id',$this->auth->id)->field('id')->find();
+            $store_id = $store ? $store['id'] : 0;
+
             $total = $this->model
             $total = $this->model
                     ->where($where)
                     ->where($where)
+                    ->where('store_id',$store_id)
                     ->order($sort, $order)
                     ->order($sort, $order)
                     ->count();
                     ->count();
 
 
             $list = $this->model
             $list = $this->model
                     ->where($where)
                     ->where($where)
+                    ->where('store_id',$store_id)
                     ->order($sort, $order)
                     ->order($sort, $order)
                     ->limit($offset, $limit)
                     ->limit($offset, $limit)
                     ->select();
                     ->select();