| 
					
				 | 
			
			
				@@ -57,7 +57,7 @@ class Index extends Api 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 $where['user.attribute'] = ['IN',['ER','BOTH']]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if($attribute == 'BOTH'){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $where['user.attribute'] = 'BOTH'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                //$where['user.attribute'] = 'BOTH'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //排除黑名单的 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -175,8 +175,17 @@ class Index extends Api 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //搜索条件 属性 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $attribute = input('attribute','all'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if($attribute != 'all' && $attribute != 'BOTH'){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            $where['user.attribute'] = $attribute; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if($attribute != 'all'){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if($attribute == 'EE'){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                $where['user.attribute'] = ['IN',['EE','BOTH']]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if($attribute == 'ER'){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                $where['user.attribute'] = ['IN',['ER','BOTH']]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if($attribute == 'BOTH'){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                //$where['user.attribute'] = 'BOTH'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //搜索条件 年龄 
			 |