From def58c1f57a5fd7f0c8782ce2a8c81ac081db3f0 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期六, 07 五月 2022 11:34:08 +0800
Subject: [PATCH] 优化业主小程序广告栏图片不显示,兼容FTP和OSS(配置时需加上 /)

---
 service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 b1c651c..1b706d4 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
@@ -1,6 +1,7 @@
 package com.java110.oa.bmo.oaWorkflowForm.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.oaWorkflow.OaWorkflowDto;
 import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
@@ -16,6 +17,7 @@
 import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.oa.bmo.oaWorkflowForm.IGetOaWorkflowFormBMO;
 import com.java110.po.workflowDataFile.WorkflowDataFilePo;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -137,6 +139,10 @@
 
         if (workflowDataFileDtos == null || workflowDataFileDtos.size() < 1) {
             return;
+        }
+        String imgUrl = MappingCache.getValue("IMG_PATH");
+        for(WorkflowDataFileDto tmpWorkflowDataFileDto: workflowDataFileDtos){
+            tmpWorkflowDataFileDto.setRealFileName(imgUrl + tmpWorkflowDataFileDto.getRealFileName());
         }
 
         datas.get(0).put("files",workflowDataFileDtos);
@@ -324,6 +330,7 @@
     }
 
     @Override
+    @Java110Transactional
     public ResponseEntity<String> auditOaWorkflow(JSONObject reqJson) {
         //鏌ヨ娴佺▼鏄惁瀛樺湪
         OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();

--
Gitblit v1.8.0