5/27 修改查询问题

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

@@ -319,6 +319,10 @@ public class FormatQueryService {
                 strCode="-";
                 optionName="-";
             }
+            else {
+                strCode=operate1.getShowName();
+                optionName=operate1.getShowName();
+            }
         } else {
             if (operate1.getCode().equals("AND")) {
                 strCode="*";
@@ -330,8 +334,33 @@ public class FormatQueryService {
                 strCode="-";
                 optionName="-";
             }
+            else {
+                strCode=operate1.getShowName();
+                optionName=operate1.getShowName();
+            }
         }
 
+//        if ((operate1.getShowName() != null)) {
+//            if (operate1.getShowName().equals("AND")) {
+//                operate1.setShowName("*");
+//            } else if (operate1.getShowName().equals("OR")) {
+//                operate1.setShowName("+");
+//            } else if (operate1.getShowName().equals("NOT")) {
+//                operate1.setShowName("-");
+//            }
+//            strCode = operate1.getShowName();
+//            optionName = operate1.getShowName();
+//        } else {
+//            if (operate1.getCode().equals("AND")) {
+//                operate1.setCode("*");
+//            } else if (operate1.getCode().equals("OR")) {
+//                operate1.setCode("+");
+//            } else if (operate1.getCode().equals("NOT")) {
+//                operate1.setCode("-");
+//            }
+//            strCode = operate1.getCode();
+//            optionName = operate1.getCode();
+//        }
         GetSqlObject getSqlObjectLocal = null;
         if (Left != null) {
             if ((operate1.gettype() == enuType.Logic || operate1.gettype() == enuType.Assignment) && (Left instanceof operateNode)) {