From cbfd407bbebc0c68a06c6e0877847284bca5596b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 9 Mar 2022 20:19:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?(=E6=96=87=E4=BB=B6),=E6=9B=B4=E6=96=B0log(=E6=96=87=E4=BB=B6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 908130299..fe99f20a1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -815,7 +815,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) {
 
                         //判断文件是否修改
-                        if (ObjectUtils.isNotEmpty(dataList.get(0).get(key)) && !dataList.get(0).get(key).equals(value)) {
+                        if ((ObjectUtils.isNotEmpty(dataList.get(0).get(key)) && !dataList.get(0).get(key).equals(value))
+                                ||(ObjectUtils.isEmpty(dataList.get(0).get(key)) && ObjectUtils.isNotEmpty(value))) {
                             String valueTemp = UUID.randomUUID().toString().replace("-", "");
                             //修改文件表关联信息connect_id
                             List<OSSFile> oSSFileList = new ArrayList<>();
@@ -827,9 +828,25 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             }
                             iOSSFileService.updateFileInfo(oSSFileList);
                             valuesBuilder.append("'" + valueTemp + "'" + ",");
-                        } else {
+                        }else{
                             valuesBuilder.append("'" + value + "'" + ",");
                         }
+//                        //判断文件是否修改
+//                        if (ObjectUtils.isNotEmpty(dataList.get(0).get(key)) && !dataList.get(0).get(key).equals(value)) {
+//                            String valueTemp = UUID.randomUUID().toString().replace("-", "");
+//                            //修改文件表关联信息connect_id
+//                            List<OSSFile> oSSFileList = new ArrayList<>();
+//                            for (String fileId : value.toString().split(",")) {
+//                                OSSFile ossFile = new OSSFile();
+//                                ossFile.setId(fileId);
+//                                ossFile.setConnectId(valueTemp);
+//                                oSSFileList.add(ossFile);
+//                            }
+//                            iOSSFileService.updateFileInfo(oSSFileList);
+//                            valuesBuilder.append("'" + valueTemp + "'" + ",");
+//                        } else {
+//                            valuesBuilder.append("'" + value + "'" + ",");
+//                        }
 
                     } else {
                         //编辑时replaced_standard被代替标准不存值,通过查询得到
@@ -982,7 +999,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             }
                             //修改的文件
                             if (ObjectUtils.isNotEmpty(valueTemp)) {
-                                List<OSSFile> fileInfosTemp = iOSSFileService.getFileInfosByConnectId((String) valueTemp);
+                                List<OSSFile> fileInfosTemp = iOSSFileService.getFileInfos((String) valueTemp);
                                 fileNameListTemp = fileInfosTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList());
                             }