| 
						
						
							
								
							
						
						
					 | 
					@ -119,11 +119,17 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) | 
					 | 
					 | 
					    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    @Override | 
					 | 
					 | 
					    @Override | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    public ContactMassLineChartResultDTO contactMassLineChart(ContactMassLineChartFormDTO contactMassLineChartFormDTO) { | 
					 | 
					 | 
					    public ContactMassLineChartResultDTO contactMassLineChart(ContactMassLineChartFormDTO contactMassLineChartFormDTO) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        List<String> subAgencyIdorGridIdList=screenCustomerAgencyService.getNextAgencyIds(contactMassLineChartFormDTO.getAreaCode(),contactMassLineChartFormDTO.getAgencyId()); | 
					 | 
					 | 
					        List<String> subAgencyIdorGridIdList=screenCustomerAgencyService.getNextAgencyIds(contactMassLineChartFormDTO.getAreaCode(),contactMassLineChartFormDTO.getAgencyId()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        log.info("当前组织的下级id:"+JSON.toJSONString(subAgencyIdorGridIdList)); | 
					 | 
					 | 
					        log.info("当前组织的下级id:"+JSON.toJSONString(subAgencyIdorGridIdList)); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					
 | 
					 | 
					 | 
					        if(CollectionUtils.isEmpty(subAgencyIdorGridIdList)){ | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					        ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO(); | 
					 | 
					 | 
					            //如果没有下级组织或者直属网格
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            result.setXAxis(new ArrayList<>()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            result.setGroupMemberData(new ArrayList<>()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            result.setGroupData(new ArrayList<>()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            return result; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        // List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChart(contactMassLineChartFormDTO.getAgencyId());
 | 
					 | 
					 | 
					        // List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChart(contactMassLineChartFormDTO.getAgencyId());
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        //多客户版修改如下:
 | 
					 | 
					 | 
					        //多客户版修改如下:
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChartByAgencyIds(subAgencyIdorGridIdList); | 
					 | 
					 | 
					        List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChartByAgencyIds(subAgencyIdorGridIdList); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |