From 8069b018919d165d093e30d190582335293c977c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 15 Aug 2024 16:20:44 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=9D=A1=E6=AC=BE=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../split/dto/FileSplitValExportDto.java      |  2 ++
 .../impl/FileSplitItemsEOServiceImpl.java     | 35 +++++++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/dto/FileSplitValExportDto.java b/laws-modules/src/main/java/com/jero/modules/split/dto/FileSplitValExportDto.java
index c9d74654..b0433c6b 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/dto/FileSplitValExportDto.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/dto/FileSplitValExportDto.java
@@ -17,5 +17,7 @@ public class FileSplitValExportDto {
 
     private String valContent;
 
+    private boolean hasImg;
+
     private List<SarFileSplitItemsTableEO> tableEOList;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index d8b08aef..29319307 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -4046,7 +4046,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     String imgUUIndex = "img" + String.valueOf(imgIndex);
                     if (MyStringUtils.isNotEmpty(imgContent)){
                         lastOne.setValContent(imgUUIndex+".png");
-                        valContent.add(lastOne);
                         FileSplitValImgExportDto fileSplitValImgExportDto = new FileSplitValImgExportDto();
                         fileSplitValImgExportDto.setImgName(imgUUIndex+".png");
                         String url = imgContent.substring(imgContent.lastIndexOf("=") + 1);
@@ -4055,7 +4054,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         if (StringUtils.isNotBlank(imgTranslation)){
                             String urlTranslation = imgTranslation.substring(imgTranslation.lastIndexOf("=") + 1);
                             fileSplitValImgExportDto.setImgPathTranslation(urlTranslation);
+                            lastOne.setHasImg(true);
+                        }else {
+                            lastOne.setHasImg(false);
                         }
+                        valContent.add(lastOne);
 
                         allImgList.add(fileSplitValImgExportDto);
                         imgIndex++;
@@ -4368,10 +4371,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 } else if ("IMG".equals(fileSplitValExportDto.getValType())) {
                                     /* 连接跳转*/
                                     CreationHelper createHelper = workbook.getCreationHelper();
-                                    Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.FILE);
+                                    //Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.FILE);
                                     String imgName = content;
-                                    hyperlink1.setAddress(imgName);
-                                    cell2.setHyperlink(hyperlink1);// 链接
+                                    //hyperlink1.setAddress(imgName);
+                                    //cell2.setHyperlink(hyperlink1);// 链接
+                                    row1.getCell(cellNum).setCellFormula("HYPERLINK(\"" + ".\\附件\\" + imgName + "\", \"" + "附件/" + imgName  + "\")");
+                                    row1.getCell(cellNum).setCellValue("附件\\" + imgName);
                                     row1.getCell(cellNum).setCellStyle(cellStyleLink);
                                 }
                                 cell2.setCellValue(content); // IllegalArgumentException异常，excel单元格最大字符长度有限制
@@ -4401,17 +4406,19 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                     row1.getCell(cellNum).setCellStyle(cellStyleLink);
                                 } else if ("IMG".equals(fileSplitValExportDto.getValType())) {
                                     /* 连接跳转*/
-                                    content = fileSplitValExportDto.getValContent();
-                                    content = content.substring(0,content.indexOf("."))+"translation.png";
-                                    CreationHelper createHelper = workbook.getCreationHelper();
-//                                    Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.FILE);
-                                    String imgName = content;
-//                                    hyperlink1.setAddress("附件\\" + imgName);
-//                                    cell2.setHyperlink(hyperlink1);// 链接
+                                    if (fileSplitValExportDto.isHasImg()) {
+                                        content = fileSplitValExportDto.getValContent();
+                                        content = content.substring(0,content.indexOf("."))+"translation.png";
+                                        CreationHelper createHelper = workbook.getCreationHelper();
+        //                                    Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.FILE);
+                                        String imgName = content;
+        //                                    hyperlink1.setAddress("附件\\" + imgName);
+        //                                    cell2.setHyperlink(hyperlink1);// 链接
 
-                                    row1.getCell(cellNum).setCellFormula("HYPERLINK(\"" + ".\\附件\\" + imgName + "\", \"" + "附件/" + imgName  + "\")");
-                                    row1.getCell(cellNum).setCellValue("附件\\" + imgName);
-                                    row1.getCell(cellNum).setCellStyle(cellStyleLink);
+                                        row1.getCell(cellNum).setCellFormula("HYPERLINK(\"" + ".\\附件\\" + imgName + "\", \"" + "附件/" + imgName  + "\")");
+                                        row1.getCell(cellNum).setCellValue("附件\\" + imgName);
+                                        row1.getCell(cellNum).setCellStyle(cellStyleLink);
+                                    }
                                 }
                                 cell2.setCellValue(content); // IllegalArgumentException异常，excel单元格最大字符长度有限制
                             }