| 
						
						
							
								
							
						
						
					 | 
					@ -79,6 +79,7 @@ import java.sql.Timestamp; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.*; | 
					 | 
					 | 
					import java.util.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.concurrent.ConcurrentHashMap; | 
					 | 
					 | 
					import java.util.concurrent.ConcurrentHashMap; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.concurrent.TimeUnit; | 
					 | 
					 | 
					import java.util.concurrent.TimeUnit; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					import java.util.concurrent.atomic.AtomicInteger; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.function.Function; | 
					 | 
					 | 
					import java.util.function.Function; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.stream.Collectors; | 
					 | 
					 | 
					import java.util.stream.Collectors; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -866,11 +867,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            throw new RenException(buildResult.getCode(),buildResult.getMsg()); | 
					 | 
					 | 
					            throw new RenException(buildResult.getCode(),buildResult.getMsg()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        Map<String, String> buildMap = buildResult.getData().stream().collect(Collectors.toMap(BuildingResultDTO::getBuildingId, BuildingResultDTO::getBuildingName)); | 
					 | 
					 | 
					        Map<String, String> buildMap = buildResult.getData().stream().collect(Collectors.toMap(BuildingResultDTO::getBuildingId, BuildingResultDTO::getBuildingName)); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					
 | 
					 | 
					 | 
					        AtomicInteger i = new AtomicInteger(NumConstant.ONE); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        result.forEach(item -> { | 
					 | 
					 | 
					        result.forEach(item -> { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            item.setGridName(gridMap.get(item.getGridId())); | 
					 | 
					 | 
					            item.setGridName(gridMap.get(item.getGridId())); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            item.setNeighborHoodName(neighborHoodMap.get(item.getNeighborHoodId())); | 
					 | 
					 | 
					            item.setNeighborHoodName(neighborHoodMap.get(item.getNeighborHoodId())); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            item.setBuildNum(buildMap.get(item.getBuildId())); | 
					 | 
					 | 
					            item.setBuildNum(buildMap.get(item.getBuildId())); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            item.setSort(i.getAndIncrement()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        }); | 
					 | 
					 | 
					        }); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return new PageData<>(result, pageInfo.getTotal()); | 
					 | 
					 | 
					        return new PageData<>(result, pageInfo.getTotal()); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |