ad

app/admin/controller/Activity.php

@@ -29,7 +29,7 @@ class Activity extends Base
         if($status!==""){
             $where[]=['ga.status',"=",$status];
         }
-        $activity_code = isset($this->post['activity_code']) && $this->post['activity_code'] !=="" ? intval($this->post['activity_code']):"";
+        $activity_code = isset($this->post['activity_code']) && $this->post['activity_code'] !=="" ? trim($this->post['activity_code']):"";
         if($activity_code!==""){
             $where[]=['ga.activity_code',"like","%$activity_code%"];
         }

app/admin/controller/Sale.php

@@ -3056,7 +3056,9 @@ class Sale extends Base
         $condition='';
         if(!empty($role['write']) && $this->uid!=""){
             // $where[]=["a.apply_id","in",$role['write']];
-            $condition .="n.contactor = {$this->uid} or a.apply_id in (".implode(',',$role['write']).")";
+            $condition .=" (gb.is_stock=1 and n.contactor = {$this->uid}) or (gb.is_stock=0 and wpo.cgder_id = {$this->uid}) or a.apply_id in (".implode(',',
+                    $role['write'])
+                .")";
         }
 //        if(!empty($role['platform']) ){
 //            $where[]=["b.platform_id","in",$role['platform']];
@@ -3071,6 +3073,7 @@ class Sale extends Base
             ->join("warehouse_info n","n.wsm_code=a.wsm_code","left")
             ->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
             ->leftJoin("order_send os","os.outCode=a.outCode")
+            ->leftJoin("purchease_order  wpo","wpo.cgdNo=os.cgdNo")
             ->where($where)
             ->where($condition)
             ->count();
@@ -3079,6 +3082,7 @@ class Sale extends Base
         $list = Db::name('order_out')
             ->alias('a')
             ->join("sale b", "b.orderCode=a.orderCode", "left")
+            ->leftJoin("purchease_order  wpo","wpo.cgdNo=os.cgdNo")
             ->join("customer_info v", "v.companyNo=b.customer_code", "left")
             ->join("warehouse_info n","n.wsm_code=a.wsm_code","left")
             ->leftJoin("order_send os","os.outCode=a.outCode")