ayHaru 4 năm trước cách đây
mục cha
commit
14c638f09e

+ 2 - 1
application/index/controller/Cabinet.php

@@ -246,7 +246,8 @@ class Cabinet extends Base
         $offset = ($param['pageNumber'] - 1) * $limit;
 
         $BoxModel = new BoxModel();
-        $selectResult = $BoxModel->getBoxsByWhere($offset, $limit);
+        $where['cabinet_number'] = $cabinet_number;
+        $selectResult = $BoxModel->getBoxsByWhere($where ,$offset, $limit);
         $box_status = ['1' => '空闲' , '2' => '已使用' , '3' => '锁定中'];
         // 拼装参数
         foreach($selectResult as $key=>$vo){

+ 2 - 2
application/index/model/BoxModel.php

@@ -45,9 +45,9 @@ class BoxModel extends Model {
      * @param $offset
      * @param $limit
      */
-    public function getBoxsByWhere($offset, $limit)
+    public function getBoxsByWhere($where , $offset, $limit)
     {
-        return $this->limit($offset, $limit)->order('box_number asc')->select();
+        return $this->where($where)->limit($offset, $limit)->order('box_number asc')->select();
     }
 
     /**