| 
					
				 | 
			
			
				@ -43,7 +43,7 @@ public class BaseVideoGroupService extends BaseJpaService<BaseVideoGroupDO, Base 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        page = page>0?page-1:0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String colSql = "SELECT id,name,sort_num sortNum,CAST(status AS UNSIGNED) status,CAST(DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') as char) createTime "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String countSql = "select count(*) "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String sql = " from base_video_group where status = 1 "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String sql = " from base_video_group where 1 = 1 "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(StringUtils.isNotBlank(name)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sql += " and name like '%"+name+"%' "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -104,7 +104,7 @@ public class BaseVideoGroupService extends BaseJpaService<BaseVideoGroupDO, Base 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String colSql = "SELECT v.id,v.type,v.title,v.url,v.img,CAST(DATE_FORMAT(v.create_time,'%Y-%m-%d %H:%i:%S') as char) createTime, " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " v.introduction,v.sort_num sortNum,CAST(v.status as UNSIGNED) status,g.name "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String countSql = "SELECT count(*) "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String fromSql = " from base_video v left join base_video_group g on v.type = g.id where v.status = 1 "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String fromSql = " from base_video v left join base_video_group g on v.type = g.id where 1 = 1 "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(StringUtils.isNotBlank(title)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            fromSql += " and v.title like '%"+title+"%' "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 |