wugg 8 meses atrás
pai
commit
878d7b85a0

+ 7 - 3
app/admin/controller/InvCat.php

@@ -143,9 +143,9 @@ class InvCat extends Base{
         if($cat_code!=''){
             $condition[]=["cat_code|merge_code","like","%$cat_code%"];
         }
-        $status =isset($this->post['status'])&&$this->post['status']!==''?intval($this->post['status']):"";
-        if($status!==''){
-          $condition[]=["status","=",$status];
+        $status =isset($this->post['status'])&&$this->post['status']!==''?$this->post['status']:[];
+        if(!empty($status)){
+            $condition[]=["status","in",$status];
         }
         $count =Db::name("inv_cat")->where($condition)->count();
         $total=ceil($count/$size);
@@ -167,6 +167,10 @@ class InvCat extends Base{
         if($cat_code!=''){
             $condition[]=["cat_code|merge_code","like","%$cat_code%"];
         }
+        $status =isset($this->post['status'])&&$this->post['status']!==''?$this->post['status']:[];
+        if(!empty($status)){
+            $condition[]=['status','in',$status];
+        }
        $list =Db::name("inv_cat")->where($condition)
        ->field("cat_name,cat_code,status,tax,addtax,sumitem,`desc`,short_name,merge_code,LENGTH(cat_name) as weight")
        ->order("weight asc,addtime desc")

+ 1 - 1
app/admin/controller/TagGood.php

@@ -443,7 +443,7 @@ class TagGood extends Base{
     if($param['order_type']==2)$param['supplierNo']==""?:$where[]=["{$sbtable}.supplierNo","like","%{$param['supplierNo']}%"];
     	$param['companyNo']==""?:$where[]=["{$sbtable}.companyNo","like","%{$param['companyNo']}%"];
     	$param['type']==''?:$where[]=["tagInfo.type","=",$param['type']];
-    	$param['status']===""?:$where[]=["status","=",$param['status']];
+    	$param['status']===""?:$where[]=["tag_log.status","=",$param['status']];
     	$param['orderCode']==""?:$where[]=["code","like","%{$param['orderCode']}%"];
     	$param['creater']==""?:$where[]=["creater","like","%{$param['creater']}%"];
     	$model =new TagLog();