| 
					
				 | 
			
			
				@@ -328,11 +328,11 @@ public class StudentOrderController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     vipGroupActivity.setVipGroupCategoryNames(categoryMap.get(vipGroupActivity.getVipGroupCategoryIdList())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     vipGroupActivity.setGiveCategoryName(categoryMap.get(vipGroupActivity.getGiveCategoryId())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     vipGroupActivityService.setActivityType(vipGroupActivity); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    if(orderByOrderNo.getOrganId().equals(4)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                    if(orderByOrderNo.getOrganId().equals(4)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         if(!DateUtil.contents(giveStartTime,giveEndTime,orderByOrderNo.getPayTime() == null?orderByOrderNo.getCreateTime():orderByOrderNo.getPayTime())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             continue; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     List<SysConfigJsonDto> cloud2022ActivityDtos = JSONArray.parseArray(activeConfig, SysConfigJsonDto.class); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     List<SysConfigJsonDto> activityDtos = cloud2022ActivityDtos.stream(). 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             filter(e -> Arrays.stream(e.getKey().split(",")).collect(Collectors.toList()). 
			 |