|  | @@ -66,21 +66,21 @@ public class YpZdGroupNameServiceImpl implements YpZdGroupNameService {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public List<YpZdGroupNameVo> selectYfAllByTime() {
 | 
	
		
			
				|  |  | -//        List<YpZdGroupNameVo> resultList = new ArrayList<>();
 | 
	
		
			
				|  |  | +        List<YpZdGroupNameVo> resultList = new ArrayList<>();
 | 
	
		
			
				|  |  |          List<YpZdGroupNameVo> list = ypZdGroupNameMapper.selectYfAllByTime();
 | 
	
		
			
				|  |  | -//        for (YpZdGroupNameVo vo : list) {
 | 
	
		
			
				|  |  | -//            String startTime = vo.getStartTime();
 | 
	
		
			
				|  |  | -//            String endTime = vo.getEndTime();
 | 
	
		
			
				|  |  | -//            if (StrUtil.isBlank(startTime)) {
 | 
	
		
			
				|  |  | -//                resultList.add(vo);
 | 
	
		
			
				|  |  | -//                continue;
 | 
	
		
			
				|  |  | -//            }
 | 
	
		
			
				|  |  | -//            if (DateUtil.isTimeInRange(
 | 
	
		
			
				|  |  | -//                    LocalTime.now(), LocalTime.parse(startTime), LocalTime.parse(endTime))) {
 | 
	
		
			
				|  |  | -//                resultList.add(vo);
 | 
	
		
			
				|  |  | -//            }
 | 
	
		
			
				|  |  | -//        }
 | 
	
		
			
				|  |  | -        return list;
 | 
	
		
			
				|  |  | +        for (YpZdGroupNameVo vo : list) {
 | 
	
		
			
				|  |  | +            String startTime = vo.getStartTime();
 | 
	
		
			
				|  |  | +            String endTime = vo.getEndTime();
 | 
	
		
			
				|  |  | +            if (StrUtil.isBlank(startTime)) {
 | 
	
		
			
				|  |  | +                resultList.add(vo);
 | 
	
		
			
				|  |  | +                continue;
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +            if (DateUtil.isTimeInRange(
 | 
	
		
			
				|  |  | +                    LocalTime.now(), LocalTime.parse(startTime), LocalTime.parse(endTime))) {
 | 
	
		
			
				|  |  | +                resultList.add(vo);
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +        return resultList;
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /**
 |