Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Activity.php

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

app/admin/controller/Customer.php

@@ -25,8 +25,8 @@ class Customer extends BaseController
     /*列表*/
     public function list(){
         $page= isset($this->post['page']) && $this->post['page']!==""? intval($this->post['page']):"1";
-        $size = isset($this->post['size']) && $this->post['size'] != "" ? intval($this->post['size']) : 10;
-        $pid =  isset($this->post['pid']) &&$this->post['pid']!=="" ?intval($this->post['pid']): 0;
+        $size = isset($this->post['size']) && $this->post['size'] != "" ? intval($this->post['size']) :"10";
+        $pid =  isset($this->post['pid']) &&$this->post['pid']!=="" ?intval($this->post['pid']): "0";
         $where =[];
         $where []= ['is_del',"=",0];
         $condition = [['is_del',"=",0]];
@@ -90,7 +90,7 @@ class Customer extends BaseController
                 $where[]=['itemid','=',$pid];
             }
         }
-        $list = Db::name('customer_org1')->where($condition)->page($page,$size)->order("addtime desc")->column("id,pid,name,level,depart_link,creater,addtime,status");
+        $list = Db::name('customer_org1')->where($condition)->order("addtime desc")->column("id,pid,name,level,depart_link,creater,addtime,status");
         $var=[];
         foreach ($list as $item) {
             $iten=[];

app/admin/controller/Suppler.php

@@ -231,6 +231,10 @@ class Suppler extends BaseController
         if($status!==""){
             $where[]= ["status","=",$status];
         }
+        $ocr_status = isset($this->post['ocr_status']) && $this->post['ocr_status'] !=="" ? intval($this->post['ocr_status']):"";
+        if($ocr_status!==""){
+            $where[]= ["ocr_status","=",$ocr_status];
+        }
         $start = isset($this->post['start']) && $this->post['start'] !== "" ?  $this->post['start']:"";
         if($start!==""){
             $where[]=['addtime',">=",$start];