| 
					
				 | 
			
			
				@@ -9,6 +9,7 @@ import com.ym.mec.common.dal.BaseDAO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.common.exception.BizException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.common.service.impl.BaseServiceImpl; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.common.tenant.TenantContextHolder; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import org.apache.commons.lang3.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.stereotype.Service; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -28,7 +29,7 @@ public class VipGroupCategoryServiceImpl extends BaseServiceImpl<Integer, VipGro 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	public List<VipGroupCategory> findAllByOrgan(String organId, String groupType) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		if (CourseSchedule.CourseScheduleType.LIVE.getCode().equalsIgnoreCase(groupType)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		if (CourseSchedule.CourseScheduleType.LIVE.getCode().equalsIgnoreCase(groupType) || StringUtils.isNotEmpty(organId)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			return vipGroupCategoryDao.findAllByOrgan1(organId, groupType); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			return vipGroupCategoryDao.findAllByOrgan(groupType); 
			 |