Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Goodup.php

@@ -135,15 +135,19 @@ class Goodup extends Base
 //            }
 //        }
 //        $role=$this->checkRole();
+        $wheror=[];
         $role = $this->checkDataShare();//取负责人字段
-        if(!empty($role[DataGroupModel::$type_全部]))  $where[]=["gb.chargerid","in",$role[DataGroupModel::$type_全部]];
+        if(!empty($role[DataGroupModel::$type_全部]))  $wheror[]=["gb.chargerid","in",$role[DataGroupModel::$type_全部]];
 
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["gb.createrid", 'in', get_company_item_user_by_name($company_name)];
 
-        $count = Db::name('good_basic')->alias('gb')->where($where)->where(function ($Query)use($wheror){
-			return $Query->whereOr($wheror);
-        })->count();
+        $count = Db::name('good_basic')
+            ->alias('gb')
+            ->where($where)
+            ->where(function ($Query) use ($wheror) {
+                return $Query->whereOr($wheror);
+            })->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('good_basic')
@@ -151,9 +155,9 @@ class Goodup extends Base
             ->field('gb.*,u.itemid')
             ->leftJoin("depart_user u", "u.uid=gb.chargerid AND u.is_del=0")
             ->where($where)
-            ->where(function ($Query)use($wheror){
-			return $Query->whereOr($wheror);
-                })->page($page,$size)
+            ->where(function ($Query) use ($wheror) {
+                return $Query->whereOr($wheror);
+            })->page($page, $size)
             ->order("addtime desc")
             ->select()
             ->toArray();