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

app/admin/controller/User.php

@@ -27,7 +27,7 @@ class User extends BaseController
             return error_show($effetc['code'],$effetc['message']);
         }
         if(isset($post['status'])){
-            $uid =Db::name("user_role")->where(["status"=>$post['status'],"is_del"=>0])->column("uid");
+            $uid =Db::name("user_role")->where(["status"=>1,"is_del"=>0])->column("uid");
             if($post['status']==1){
             $post['uid']=$uid;
             }else{
@@ -185,7 +185,7 @@ class User extends BaseController
             return app_show($effetc['code'],$effetc['message']);
         }
         if(isset($post['status'])){
-            $uid =Db::name("user_role")->where(["status"=>$post['status'],"is_del"=>0])->column("uid");
+            $uid =Db::name("user_role")->where(["status"=>1,"is_del"=>0])->column("uid");
             if($post['status']==1){
                 $post['uid']=$uid;
             }else{
@@ -245,7 +245,7 @@ class User extends BaseController
             $post['uid'] =$uids;
         }
         if(isset($post['status'])){
-            $uid =Db::name("user_role")->where(["status"=>$post['status'],"is_del"=>0])->column("uid");
+            $uid =Db::name("user_role")->where(["status"=>1,"is_del"=>0])->column("uid");
             if($post['status']==1){
                 $post['uid']= isset($uids)?array_unique(array_merge($uids,$uid)):$uid;
             }else{