From 7a902e3f7c3418a7d1fa65b46921a5a7eb93cb2b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 30 八月 2021 23:34:57 +0800
Subject: [PATCH] 优化代码

---
 service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 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 6eaf520..638379f 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
@@ -168,6 +168,8 @@
         reqJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
         oaWorkflowUserInnerServiceSMOImpl.startProcess(reqJson);
 
+
+
         return ResultVo.success();
     }
 
@@ -364,14 +366,15 @@
 
         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