bugfix

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/statement/ActionExecute.java

@@ -1,5 +1,6 @@
 package com.x.query.assemble.surface.jaxrs.statement;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -19,6 +20,8 @@ import com.x.base.core.project.exception.ExceptionEntityNotExist;
 import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.scripting.ScriptingEngine;
 import com.x.query.assemble.surface.Business;
 import com.x.query.core.entity.schema.Statement;
@@ -26,36 +29,41 @@ import com.x.query.core.entity.schema.Table;
 
 class ActionExecute extends BaseAction {
 
+	private static Logger logger = LoggerFactory.getLogger(ActionExecute.class);
+
 	private ScriptingEngine scriptingEngine;
 
 	ActionResult<Object> execute(EffectivePerson effectivePerson, String flag, JsonElement jsonElement)
 			throws Exception {
 
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			logger.debug("flag:{}, jsonElement:{}.", flag, jsonElement);
 			ActionResult<Object> result = new ActionResult<>();
 			Business business = new Business(emc);
-			Statement statement = emc.flag(flag, Statement.class);
+			Statement statement = business.pick(flag, Statement.class);
 			if (null == statement) {
 				throw new ExceptionEntityNotExist(flag, Statement.class);
 			}
 			if (!business.executable(effectivePerson, statement)) {
 				throw new ExceptionAccessDenied(effectivePerson, statement);
 			}
-			Table table = emc.find(statement.getTable(), Table.class);
+			Table table = business.pick(statement.getTable(), Table.class);
 			if (null == table) {
 				throw new ExceptionEntityNotExist(statement.getTable(), Table.class);
 			}
-
-			Map<String, Object> parameter = XGsonBuilder.instance().fromJson(jsonElement,
-					new TypeToken<Map<String, Object>>() {
-					}.getType());
-
+			Map<String, Object> parameter = null;
+			if ((null != jsonElement) && (!jsonElement.isJsonNull())) {
+				parameter = XGsonBuilder.instance().fromJson(jsonElement, new TypeToken<Map<String, Object>>() {
+				}.getType());
+			} else {
+				parameter = new LinkedHashMap<String, Object>();
+			}
 			this.beforeScript(business, effectivePerson, statement, parameter);
-
 			DynamicEntity dynamicEntity = new DynamicEntity(table.getName());
 			@SuppressWarnings("unchecked")
 			EntityManager em = emc.get((Class<JpaObject>) Class.forName(dynamicEntity.className()));
 			Query query = em.createQuery(statement.getData());
+			logger.debug("parameter:{}.", parameter);
 			for (Entry<String, Object> en : parameter.entrySet()) {
 				query.setParameter(en.getKey(), en.getValue());
 			}

o2server/x_query_core_express/src/main/java/com/x/query/core/express/plan/StatPlan.java

@@ -253,7 +253,7 @@ public class StatPlan extends GsonPropertyObject {
 		}
 		if (StringUtils.equalsIgnoreCase(SelectEntry.ORDER_DESC, calculate.orderType)
 				|| StringUtils.equalsIgnoreCase(SelectEntry.ORDER_ASC, calculate.orderType)) {
-			/* 需要进行排序如果为空则不进行排序 */
+			/* 需要进行排序如果为空则对标题进行排序 */
 			if (StringUtils.isEmpty(calculate.orderColumn)) {
 				/* 按分类值进行排序 */
 				if (StringUtils.equalsIgnoreCase(SelectEntry.ORDER_ASC, calculate.orderType)) {
@@ -364,7 +364,7 @@ public class StatPlan extends GsonPropertyObject {
 	public static class ColumnComparator implements Comparator<CalculateGroupRow> {
 
 		Collator collator = Collator.getInstance(java.util.Locale.CHINA);
-
+		
 		private String column;
 
 		public ColumnComparator(String column) {