作者 刘朕
1 个管道 的构建 通过 耗费 1 秒

合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !231
@@ -42,7 +42,7 @@ class StoreInform extends Backend @@ -42,7 +42,7 @@ class StoreInform extends Backend
42 /** 42 /**
43 * 查看 43 * 查看
44 */ 44 */
45 - public function index() 45 + public function index($ids = null)
46 { 46 {
47 //当前是否为关联查询 47 //当前是否为关联查询
48 $this->relationSearch = true; 48 $this->relationSearch = true;
@@ -55,15 +55,20 @@ class StoreInform extends Backend @@ -55,15 +55,20 @@ class StoreInform extends Backend
55 { 55 {
56 return $this->selectpage(); 56 return $this->selectpage();
57 } 57 }
  58 + $where_s = [
  59 + 'store_id' => $ids
  60 + ];
58 list($where, $sort, $order, $offset, $limit) = $this->buildparams(); 61 list($where, $sort, $order, $offset, $limit) = $this->buildparams();
59 $total = $this->model 62 $total = $this->model
60 ->with(['store']) 63 ->with(['store'])
  64 + ->where($where_s)
61 ->where($where) 65 ->where($where)
62 ->order($sort, $order) 66 ->order($sort, $order)
63 ->count(); 67 ->count();
64 68
65 $list = $this->model 69 $list = $this->model
66 ->with(['store']) 70 ->with(['store'])
  71 + ->where($where_s)
67 ->where($where) 72 ->where($where)
68 ->order($sort, $order) 73 ->order($sort, $order)
69 ->limit($offset, $limit) 74 ->limit($offset, $limit)