| 
					
				 | 
			
			
				@@ -55,7 +55,7 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private final AdminMapper adminMapper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private final AdminWebsitService adminWebsitService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private final MerchantWebsitService merchantWebsitService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private final AdminWebsitRegionService adminWebsitRegionService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private final MerchantWebsitRegionService merchantWebsitRegionService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private final UserService userService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private final OSSUtil ossUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private final SysConfigService sysConfigService; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -176,7 +176,7 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //平台业务员的区id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (StringUtils.equals(adminUserCom.getType(), RoleTypeEnum.A.getCode())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //区域id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                List<MerchantWebsitRegion> merchantWebsitRegions = adminWebsitRegionService.lambdaQuery().in(MerchantWebsitRegion::getAdminWebsitId, adminUserCom.getAdminWebsitIds()).list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                List<MerchantWebsitRegion> merchantWebsitRegions = merchantWebsitRegionService.lambdaQuery().in(MerchantWebsitRegion::getAdminWebsitId, adminUserCom.getAdminWebsitIds()).list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 adminUserCom.setAreaIds(merchantWebsitRegions.stream().map(MerchantWebsitRegion::getAreaId).distinct().collect(Collectors.toList())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |