Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -1468,7 +1468,12 @@ public class EsService {
             commonVO.setTaskId(taskId);
             commonVO.setProjectId(projectId);
             commonVO.setProductId(productId);
-            commonVO.setSearchCondition(searchCondition);
+            if (searchCondition.contains("罒")) {
+                String replace = searchCondition.replace("罒", " OR ");
+                commonVO.setSearchCondition(replace);
+            } else {
+                commonVO.setSearchCondition(searchCondition);
+            }
             commonVO.setProductFrom(productFrom);
             commonVO.setCurrent(current);
             commonVO.setSize(size);