ad

app/admin/controller/Good.php

@@ -18,8 +18,8 @@ class Good extends Base
 	 */
     public function list(){
     	$param=$this->request->param(["spuCode"=>"","status"=>"","good_name"=>"",'companyNo'=>'','supplierNo'=>'',
-    	'creater'=>'','isZx'=>'','isChange'=>'',"cat_diff"=>"","tax_diff"=>"","is_diff"=>"","start"=>"",'end'=>'',
-    	'page'=>'1','size'=>'15'],"post","trim");
+    	'creater'=>'','isZx'=>'','isCombind'=>'','isChange'=>'',"cat_diff"=>"","tax_diff"=>"","is_diff"=>"",
+    	"start"=>"",'end'=>'','page'=>'1','size'=>'15'],"post","trim");
     	$where=[];
     	$param["spuCode"]==""?: $where[]=['spuCode','like',"%{$param['spuCode']}%"];
     	$param["good_name"]==""?: $where[]=['good_name','like',"%{$param['good_name']}%"];
@@ -28,6 +28,7 @@ class Good extends Base
     	$param["creater"]==""?: $where[]=['creater','like',"%{$param['creater']}%"];
     	$param["status"]===""?: $where[]=['status','=',$param['status']];
     	$param["isZx"]==""?: $where[]=['isZx','=',$param['isZx']];
+    	$param["isCombind"]==""?: $where[]=['isCombind','=',$param['isCombind']];
     	$param["isChange"]===""?: $where[]=['isChange','=',$param['isChange']];
     	$param["is_diff"]==""?: $where[]=['cat_diff|tax_diff','=',2];
     	$param["cat_diff"]==""?: $where[]=['cat_diff','=',$param['cat_diff']];