lengyuace 发布系统代码 [TrainSys，网页端]

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json

@@ -523,6 +523,18 @@
         "condType" : "GROUP",
         "name" : "连接条件",
         "getPSDEDQConditions" : [ {
+          "condOp" : "EQ",
+          "condType" : "SINGLE",
+          "condValue" : "aaaa",
+          "fieldName" : "FIELD9",
+          "name" : "FIELD9 等于(=) 数据上下文(aaaa)",
+          "getPSDEField" : {
+            "name" : "FIELD9",
+            "codeName" : "Field9"
+          },
+          "getPSVARTypeId" : "DATACONTEXT",
+          "ignoreEmpty" : true
+        }, {
           "condOp" : "GT",
           "condType" : "SINGLE",
           "condValue" : "1111",
@@ -541,18 +553,6 @@
             "name" : "FIELD9",
             "codeName" : "Field9"
           }
-        }, {
-          "condOp" : "EQ",
-          "condType" : "SINGLE",
-          "condValue" : "aaaa",
-          "fieldName" : "FIELD9",
-          "name" : "FIELD9 等于(=) 数据上下文(aaaa)",
-          "getPSDEField" : {
-            "name" : "FIELD9",
-            "codeName" : "Field9"
-          },
-          "getPSVARTypeId" : "DATACONTEXT",
-          "ignoreEmpty" : true
         } ]
       }
     },

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -3,7 +3,7 @@
   "name" : "MySQL5",
   "getPSDEDataQueryCodeConds" : [ {
     "condType" : "CUSTOM",
-    "customCond" : "( t1.`FIELD45` > 1111  AND  t1.`FIELD9` IS NULL  AND  <choose><when test=\"ctx.datacontext.aaaa !=null \">  t1.`FIELD9` = #{ctx.datacontext.aaaa}  </when><otherwise>1=1</otherwise></choose> )",
+    "customCond" : "( <choose><when test=\"ctx.datacontext.aaaa !=null \">  t1.`FIELD9` = #{ctx.datacontext.aaaa}  </when><otherwise>1=1</otherwise></choose>  AND  t1.`FIELD45` > 1111  AND  t1.`FIELD9` IS NULL )",
     "name" : "查询条件"
   } ],
   "getPSDEDataQueryCodeExps" : [ {