ad

app/admin/controller/User.php

@@ -57,11 +57,16 @@ class User extends BaseController{
 	 */
     public function  userList(){
     	$post=$this->request->only(["token"=>"","nickname"=>"","relaComNo"=>"","islevel"=>"","username"=>"","companyNo"=>"","status"=>"","page"=>1,"size"=>10],"post");
-        $post['companyNo']==""? ($post['companyNo']=$post['relaComNo']??""):"";
+       if($this->level==1){
+       	$companyNo = $post['companyNo']??"";
+       }else{
+       	$companyNo = $post['relaComNo']??"";
+       	$post['companyNo'] = $post['relaComNo']??"";
+       }
         $where=[["a.is_del","=",0]];
     	unset($post['relaComNo']);
     	if($post['companyNo']!=""){
-    		$where[]=["a.companyNo","=",$post['companyNo']];
+    		$where[]=["a.companyNo","=",$companyNo];
     	}
     	if($post['status']!==''){
     		 $uid =Db::name("user_role")->alias("a")->where(["status"=>1,"is_del"=>0])->where($where)->column("uid");
@@ -77,12 +82,11 @@ class User extends BaseController{
 
 
             $uid =Db::name("user_role")->alias("a")
-            ->leftJoin("role b","a.roleid=b.id")->where($where)->column("uid");
+            ->leftJoin("role b","a.roleid=b.id")->where([["b.level","=",1],["a.is_del","=",0]])->where($where)->column
+            ("uid");
              if($post['islevel']==1){
-             	$where[]=["b.level","=",1];
                 $post['uid']= $uid;
             }else{
-             	$where[]=["b.level","<>",1];
                 $post['nouid']=$uid;
             }
              unset($post["islevel"]);

app/common.php

@@ -233,7 +233,12 @@ function addacount($condition){
 
     return json_decode($response,true);
 }
+if(!function_exists("headerSign")){
 
+	function headerSign($post,$headerArr){
+
+	}
+}
 
 //参数1：访问的URL，参数2：post数据(不填则为GET)，参数3：提交的$cookies,参数4：是否返回$cookies
 function curl_request($url,$post='',$header=["Content-Type: multipart/json;charset=utf-8"]){