fix:供应商分类

app/admin/controller/SupplierCat.php

@@ -48,7 +48,7 @@ class SupplierCat extends Base
             $firstLevelCatId = $secondLevelCatCollection[$thirdLevelCat['pid']]['pid'];
             $secondLevelCatId = $secondLevelCatCollection[$thirdLevelCat['pid']]['id'];
             $thirdLevelCatId = $thirdLevelCat['id'];
-            $catFullId = $firstLevelCatId.'_'.$secondLevelCatId.'_'.$thirdLevelCat;
+            $catFullId = $firstLevelCatId.'_'.$secondLevelCatId.'_'.$thirdLevelCatId;
 
             $record = Db::name('supplier_cat')
                 ->where(['supplierNo' => $supplierNo,'cat_id' => $thirdLevelCatId])
@@ -76,9 +76,18 @@ class SupplierCat extends Base
 
     // 列表
     public function list(){
-        $param = $this->request->filter("trim")->only(['page' => 1,'size' => 15, 'creater'=>'','status'=>'','cat_id'=>'']);
+        $param = $this->request->filter("trim")->only(['page' => 1,'size' => 15,'start'=>'','end' => '' ,'supplierNo'=>''
+            ,'creater'=>'','status'=>'','cat_id'=>'']);
+
         $where = [['sc.is_del','=','0']];
 
+        if($param['start']!=="" && $param['end'] !== ""){
+            $where[]=['sc.addtime',">=", $param['start']." 00:00:00"];
+            $where[]=['sc.addtime',"<=", $param['end']." 23:59:59"];
+        }
+
+
+        if($param['supplierNo'] != '') $where[] = ['sc.supplierNo','=',$param['supplierNo']];
         if($param['status'] != '') $where[] = ['sc.status','=',$param['status']];
         if($param['cat_id'] != '') $where[] = ['sc.cat_id','=',$param['cat_id']];
         if($param['creater'] != '') $where[] = ['sc.creater','like',"%{$param['creater']}%"];
@@ -103,7 +112,7 @@ class SupplierCat extends Base
         $record = Db::name('supplier_cat')->where(['id'=>$param['id'],'is_del'=>0])->find();
 
         if(!$record) return json_show(1002,'未找到记录');
-        if(!is_array($param['status'],[0,1]))  return json_show(1002,"参数status值不合法");
+        if(!in_array($param['status'],[0,1]))  return json_show(1002,"参数status值不合法");
 
         $record['status'] = $param['status'];
         $record['updatetime'] = date('Y-m-d H:i:s');