调整对手分析搜索条件

src/main/java/ieven/server/webapp/domain/data/DataService.java

@@ -123,17 +123,22 @@ public class DataService {
                 }
             }
             Criteria cri = new Criteria();
+            if(param.getDeleteName()==2){
+                criList.addAll(PublicStatic.getQuery());
+            }
             if ("and".equals(mode)) {
                 cri.andOperator(criList);
             } else {
                 cri.orOperator(criList);
             }
             criteria.andOperator(cri);
+        }else if(CollectionUtils.isEmpty(param1List)&&param.getDeleteName()==2){
+            criteria.andOperator(PublicStatic.getQuery());
         }
         Query dataQuery = new Query(criteria);
-        if (param.getDeleteName() == 2) {
+     /*   if (param.getDeleteName() == 2) {
             dataQuery.addCriteria(new Criteria().andOperator(PublicStatic.getQuery()));
-        }
+        }*/
         Long total = dataService.countTotalByQuery(dataQuery);
         Future<LinkedHashMap<String, String>> headerFuture = dataService.viewHeaders(fileId);
         if (CollectionUtils.isNotEmpty(param.getOrders())) {
@@ -243,12 +248,17 @@ public class DataService {
                 }
             }
             Criteria cri = new Criteria();
+            if(param.getDeleteName()==2){
+                criList.addAll(PublicStatic.getQuery());
+            }
             if ("and".equals(mode)) {
                 cri.andOperator(criList);
             } else {
                 cri.orOperator(criList);
             }
             criteria.andOperator(cri);
+        }else if(CollectionUtils.isEmpty(param1List)&&param.getDeleteName()==2){
+            criteria.andOperator(PublicStatic.getQuery());
         }
         Query dataQuery = new Query(criteria);
         if (param.getDeleteName() == 2) {