| 
					
				 | 
			
			
				@@ -39,7 +39,7 @@ public class EsLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public  List<CommonListES>  list(List<String> websitNumbers,String workerNumber,String comId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public  List<CommonListES> list(List<String> websitNumbers,String workerNumber,String comId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //标题 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         BoolQueryBuilder titleQueryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("type", "1")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(StringUtils.isNotEmpty(comId)){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -51,7 +51,7 @@ public class EsLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             must.must(QueryBuilders.termQuery("comListId", comId)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(StringUtils.isNotEmpty(workerNumber)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            must.must(QueryBuilders.termQuery("workerNumber.keyword", workerNumber)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            must.must(QueryBuilders.termQuery("workerNumber", workerNumber)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 /*        if(CollectionUtils.isNotEmpty(websitNumbers)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             must.must(QueryBuilders.termsQuery("websitNumber.keyword",websitNumbers)); 
			 |