From 56729e00794927d25bb510081d396ce553b33bf5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 31 八月 2021 01:17:33 +0800
Subject: [PATCH] 优化待git
---
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
index a0594ba..0f48125 100644
--- a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
+++ b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
@@ -253,14 +253,14 @@
long count = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatasCount(oaWorkflowDataDto);
- List<JSONObject> datas = null;
-
+ List<JSONObject> datas = new ArrayList<>();
if (count > 0) {
- datas = BeanConvertUtil.covertBeanList(oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto), JSONObject.class);
+ List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
+ for(OaWorkflowDataDto oaWorkflowDataDto1 : oaWorkflowDataDtos){
+ datas.add(BeanConvertUtil.beanCovertJson(oaWorkflowDataDto1));
+ }
//鍒锋柊 琛ㄥ崟鏁版嵁
freshFormData(datas, paramIn, oaWorkflowFormDtos.get(0));
- } else {
- datas = new ArrayList<>();
}
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) paramIn.getInteger("row")), count, datas);
--
Gitblit v1.8.0