Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Good.php

@@ -106,7 +106,7 @@ class Good extends Base
             $where[]=['a.brand_id',"=",$brand_id];
         }
         $role=$this->checkRole();
-        if(!empty($role['write'])){
+        if(!empty($role['write']) &&$role['roleid']==8 ){
             $where[]=["a.createrid","in",$role['write']];
         }
         $count = Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where($where)

app/admin/controller/Goodup.php

@@ -132,7 +132,7 @@ class Goodup extends Base
 //            }
 //        }
         $role=$this->checkRole();
-        if(!empty($role['write'])){
+        if(!empty($role['write']) &&$role['roleid']==8){
             $where[]=["createrid","in",$role['write']];
         }
         $count = Db::name('good_basic')->where($where)->count();