| 
					
				 | 
			
			
				@ -234,11 +234,10 @@ public class ActivityController extends EnvelopRestEndpoint { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @RequestParam(value = "size", required = false) Integer size) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            StringBuffer stringBuffer=new StringBuffer(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            stringBuffer.append("delFlag=1;"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (StringUtils.isNotEmpty(filter)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append("title?").append(filter).append(" g1;").append("organizer?").append(filter).append(" g1;").append("areaName?").append(filter).append(" g1;"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append(filter).append("delFlag=1;"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append("delFlag=1;"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (null != status && "2".equals(status) ) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append("status=2;"); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -249,14 +248,14 @@ public class ActivityController extends EnvelopRestEndpoint { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append("crowdType="+crowdType+";"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if(StringUtils.isNotBlank(releaseTime)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append("releaseTime="+releaseTime+";"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append("releaseTime?"+releaseTime+";"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if(StringUtils.isNotBlank(activityOfflineTime)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append("activityOfflineTime="+activityOfflineTime+";"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append("activityOfflineTime?"+activityOfflineTime+";"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String sorts="-createTime"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            List<ActivityDO> activityDOList = service.search("", stringBuffer.toString(), sorts, page, size); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            int count = (int) service.getCount(filter); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            int count = (int) service.getCount(stringBuffer.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            return success(activityDOList, count, page, size); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }catch (Exception e){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            e.printStackTrace(); 
			 |