| 
					
				 | 
			
			
				@@ -1,5 +1,6 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 package com.fs.app.controller; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import cn.hutool.core.util.ObjectUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.alibaba.fastjson.JSON; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.fs.app.annotation.Login; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.fs.common.core.domain.R; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -80,10 +81,14 @@ public class CompanyTagController extends AppBaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Login 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @GetMapping("/tagSubUsers") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @ApiOperation("标签下会员列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public R tagSubUsers(@RequestParam(required = false) List<Long> tagId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public R tagSubUsers(@RequestParam(required = false) List<Long> tagId,Long companyUserId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String, Object> params = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         params.put("tagIds", tagId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        params.put("companyUserId", getCompanyUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (ObjectUtil.isEmpty(companyUserId)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            params.put("companyUserId", getCompanyUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            params.put("companyUserId", companyUserId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return R.ok().put("data", companyTagUserService.selectUserListByMap(params)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |