From 6a259fd0c1559aab8813b805d67c72111e20476e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 14:29:32 +0800
Subject: [PATCH] 优化疫情上报功能
---
java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java b/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
index 56d0a7c..c7f7d91 100755
--- a/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
+++ b/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONPath;
+import com.alibaba.fastjson.parser.Feature;
import com.java110.core.factory.DataTransactionFactory;
import com.java110.db.dao.IQueryServiceDAO;
import com.java110.entity.service.ServiceSql;
@@ -354,9 +355,9 @@
List<String> columns = new ArrayList<>();
Interpreter interpreter = new Interpreter();
interpreter.eval(javaCode);
- interpreter.set("params", params.toJSONString());
+ interpreter.set("params", params);
interpreter.set("queryServiceDAOImpl",queryServiceDAOImpl);
- JSONObject results = JSONObject.parseObject(interpreter.eval("execute(params,queryServiceDAOImpl)").toString());
+ JSONObject results = JSONObject.parseObject(interpreter.eval("execute(params,queryServiceDAOImpl)").toString(), Feature.OrderedField);
JSONArray data = null;
if (results == null || results.size() < 1) {
@@ -366,8 +367,10 @@
}
JSONArray th = new JSONArray();
- for (String key : data.getJSONObject(0).keySet()) {
- th.add(key);
+ if(data.size()>0) {
+ for (String key : data.getJSONObject(0).keySet()) {
+ th.add(key);
+ }
}
JSONObject paramOut = new JSONObject();
paramOut.put("th", th);
--
Gitblit v1.8.0