| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -1738,11 +1738,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        optionsQuery.setCustomerId(customerId); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        optionsQuery.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        optionsQuery.setColumnName("VOLUNTEER_CATEGORY"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        List<IcFormItemOptionsDTO> categorieDtos = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                ServiceConstant.OPER_CUSTOMIZE_SERVER, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                "【志愿者分布】志愿者简介-查询志愿者类别失败", | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                "【志愿者分布】志愿者简介-查询志愿者类别失败"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        List<IcFormItemOptionsDTO> categorieDtos = getResultDataOrReturnNull(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                ServiceConstant.OPER_CUSTOMIZE_SERVER); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        if (CollectionUtils.isEmpty(categorieDtos)) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            return new HashMap(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        return categorieDtos.stream() | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                .collect(Collectors.toMap(IcFormItemOptionsDTO::getOptionValue, IcFormItemOptionsDTO::getOptionLabel)); | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |