5/27 修改查询问题

src/main/java/cn/cslg/pas/service/query/FormatQueryService.java

@@ -302,33 +302,34 @@ public class FormatQueryService {
      * @return
      */
     public String webQueryToString(operateNode node, GetSqlObject getSqlObject, String tableName) {
-        operate operate1 =new operate();
-        BeanUtils.copyProperties(node.getoperate(),operate1);
-//        operate operate1 =  node.getoperate();
+
+       operate operate1 =  node.getoperate();
         treeNode Left = node.getLeft();
         treeNode Right = node.getRight();
         String strCode = "";
         String optionName = "";
         if ((operate1.getShowName() != null)) {
             if (operate1.getShowName().equals("AND")) {
-                operate1.setShowName("*");
+                strCode="*";
+                optionName="*";
             } else if (operate1.getShowName().equals("OR")) {
-                operate1.setShowName("+");
+                strCode="+";
+                optionName="+";
             } else if (operate1.getShowName().equals("NOT")) {
-                operate1.setShowName("-");
+                strCode="-";
+                optionName="-";
             }
-            strCode = operate1.getShowName();
-            optionName = operate1.getShowName();
         } else {
             if (operate1.getCode().equals("AND")) {
-                operate1.setCode("*");
+                strCode="*";
+                optionName="*";
             } else if (operate1.getCode().equals("OR")) {
-                operate1.setCode("+");
+                strCode="+";
+                optionName="+";
             } else if (operate1.getCode().equals("NOT")) {
-                operate1.setCode("-");
+                strCode="-";
+                optionName="-";
             }
-            strCode = operate1.getCode();
-            optionName = operate1.getCode();
         }
 
         GetSqlObject getSqlObjectLocal = null;
@@ -390,8 +391,10 @@ public class FormatQueryService {
 
         //将检索式转换为二叉树
         treeNode tree = null;
+
         try {
             tree = expressManager.getInstance().Parse(query, false);
+
         } catch (Exception e) {
             e.printStackTrace();
         }