ad

app/admin/controller/User.php

@@ -170,7 +170,7 @@ class User extends BaseController{
 
   //获取所有用户的信息
    public  function  userAll(){
-    	$post=$this->request->only(['relaComNo'=>"","nickname"=>"","roleid"=>"","status"=>""],"post","trim");
+    	$post=$this->request->only(['relaComNo'=>"","companyNo"=>"","nickname"=>"","roleid"=>"","status"=>""],"post","trim");
     	$condition = [["is_del","=",0]];
 
     	$rolecond=" level in (1,2,3)";
@@ -178,6 +178,10 @@ class User extends BaseController{
     		$condition[]=["companyNo","=",$post['relaComNo']];
     		$rolecond = "level=1 or (level in (2,3) and companyNo ='{$post['relaComNo']}' )";
     	}
+    	if($post['companyNo']!=""){
+    		$condition[]=["companyNo","=",$post['companyNo']];
+    		$rolecond = "level=1 or (level in (2,3) and companyNo ='{$post['companyNo']}' )";
+    	}
     	if($post['roleid']!=""){
     		$condition[]=["roleid","=",$post['roleid']];
     		$rolecond = "id={$post['roleid']}";