From d095d76460d914561fc2e07d79cc6eefe8d34814 Mon Sep 17 00:00:00 2001
From: bob <bob.liu@happyelements.net>
Date: Mon, 13 Mar 2023 11:46:20 +0800
Subject: [PATCH] fix(oaProject) change attachment path

---
 ruoyi-admin/src/main/resources/application.yml               | 2 +-
 .../java/com/ruoyi/flowable/domain/vo/AttachmentInfoVO.java  | 5 +++--
 .../com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 96b1db4..3db408a 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -127,4 +127,4 @@ flowable:
   # 关闭定时任务JOB
   async-executor-activate: false
 attachment:
-  path: /tmp
+  path: /data/attachment
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/vo/AttachmentInfoVO.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/vo/AttachmentInfoVO.java
index 0fc63ca..b3bf13e 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/vo/AttachmentInfoVO.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/vo/AttachmentInfoVO.java
@@ -1,6 +1,7 @@
 package com.ruoyi.flowable.domain.vo;
 
 import cn.hutool.core.img.ImgUtil;
+import cn.hutool.core.io.FileUtil;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.apache.commons.lang3.StringUtils;
@@ -23,8 +24,8 @@ public class AttachmentInfoVO {
         this.isImg = false;
     }
 
-    public void setBase64ByFile(String path, String type) {
-        if (this.isImg) {
+    public void parseImageBase64(String path, String type) {
+        if (this.isImg && FileUtil.exist(path)) {
             this.base64 = ImgUtil.toBase64(ImgUtil.read(path), type);
         }
     }
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
index ef78203..858d6e1 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
@@ -840,7 +840,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         List<AttachmentInfoVO> list = attachmentIds.stream().map(e -> sysAttachmentService.selectSysAttachmentById(e)).map(e->{
             AttachmentInfoVO vo = new AttachmentInfoVO();
             vo.setIsImgByContentType(e.getContentType());
-            vo.setBase64ByFile(e.getPath(),e.getType());
+            vo.parseImageBase64(e.getPath(),e.getType());
             vo.setId(e.getId());
             vo.setName(e.getName());
             vo.setType(e.getType());