From ab92a4dccabcc00deb5bd430137130acdfb3309e Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Wed, 19 Oct 2022 09:40:53 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue            | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index ca9de26a5..c09c6e5c9 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1456,15 +1456,18 @@
         this.selectedRowKeys = value
       },
       searchQuery() {
+        this.selectedRowKeys = []
         this.getList()
       },
       searchReset() {
         this.queryParam = {}
+        this.selectedRowKeys = []
         this.$refs.globalAdvancedQueryRef.resetLine()
         this.$refs.globalAdvancedQueryRef.emitCallback()
         // this.getList()
       },
       addModelList() {
+        this.selectedRowKeys = []
         this.getList()
       },
       handleSuperQuery(params, matchType) {
@@ -2130,7 +2133,7 @@
         } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){
+        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else {
@@ -2151,7 +2154,7 @@
         } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
           window.open(url, '_blank')
-        }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){
+        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + id + fileSuffix)
           window.open(url, '_blank')
         } else {
@@ -2484,17 +2487,17 @@
   }
 
   ::v-deep .ant-table-body-one {
-    padding-bottom: 0!important;
+    padding-bottom: 0 !important;
   }
 
   ::v-deep .antfixedLeft {
-    padding-bottom: 0!important;
-    overflow: scroll!important;
+    padding-bottom: 0 !important;
+    overflow: scroll !important;
   }
 
   ::v-deep .antfixedRight {
-    padding-bottom: 0!important;
-    overflow: scroll!important;
+    padding-bottom: 0 !important;
+    overflow: scroll !important;
   }
 </style>
 <style>

From 331169bd9b14580eb160f95386d0151c0a3a97a9 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Wed, 19 Oct 2022 13:49:24 +0800
Subject: [PATCH 2/8] bug61358

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

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
index c833e10cd..4c9f4d6cf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
@@ -2,6 +2,7 @@ package com.jero.modules.compare.service.impl;
 
 import com.aliyuncs.utils.IOUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
@@ -20,7 +21,6 @@ import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -36,8 +36,6 @@ import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @Description: 文档对比信息条款评论表
@@ -102,7 +100,29 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
      */
     @Override
     public void deleteById(String id) {
+        //删除时需要判断左侧跟右侧是否还有评论，如果没有，将对应的reviewed改为0
+        String itemsIdLeft;
+        String itemsIdRight;
+        SarFileCompareItemComment sarFileCompareItemComment = queryById(id);
+        itemsIdLeft = sarFileCompareItemComment.getItemsIdLeft();
+        itemsIdRight = sarFileCompareItemComment.getItemsIdRight();
         removeById(id);
+
+        QueryWrapper<SarFileCompareItemComment> left = new QueryWrapper<>();
+        left.eq("items_id_left", itemsIdLeft);
+        if (baseMapper.selectCount(left) == 0) {
+            SarFileCompareItem sarFileCompareItem = SarFileCompareItemServiceImpl.queryById(itemsIdLeft);
+            sarFileCompareItem.setReviewed(0);
+            SarFileCompareItemServiceImpl.saveOrUpdate(sarFileCompareItem);
+        }
+        QueryWrapper<SarFileCompareItemComment> right = new QueryWrapper<>();
+        right.eq("items_id_right", itemsIdRight);
+        if (baseMapper.selectCount(right) == 0) {
+            SarFileCompareItem sarFileCompareItem = SarFileCompareItemServiceImpl.queryById(itemsIdRight);
+            sarFileCompareItem.setReviewed(0);
+            SarFileCompareItemServiceImpl.saveOrUpdate(sarFileCompareItem);
+        }
+
     }
 
     /**

From a0d1decb59b80f4ac800c8ac381205d3c6552311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Wed, 19 Oct 2022 13:51:39 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                             | 1 +
 jero-web/src/common/lang/zh-cn.js                             | 1 +
 .../searchCenter/components/problemKnowledgeBase.vue          | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 5818f4338..fb1b870a0 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -199,6 +199,7 @@ module.exports = {
   OperationType: 'Operation Type',
   selectOperationType: 'Please select Operation type',
   selectProblemClassification:'Please select Problem Classification',
+  selectClassification:'Please select Classification',
   selectTranslationResults:'Please select Translation results',
   selectMarket:'Please select Market',
   RequestMethod: 'Request Method',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index c56ac1522..eb5e9af9a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -201,6 +201,7 @@ module.exports = {
   OperationType: '操作类型',
   selectOperationType: '请选择操作类型',
   selectProblemClassification:'请选择问题分类',
+  selectClassification:'请选择分类',
   selectTranslationResults:'请选择翻译结果',
   selectMarket:'请选择市场',
   RequestMethod: '请求方法',
diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
index 65f3dbeab..f22aa238b 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
@@ -4,8 +4,8 @@
       <div class="text-left">
         <div class="text-left-wrap">
           <div class="text-left-select">
-            <span class="text-sel" :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
-            <a-select :placeholder="$t('selectProblemClassification')"
+            <span class="text-sel" :title="$t('classification')">{{$t('classification')}}</span>
+            <a-select :placeholder="$t('selectClassification')"
                       class="text-select"
                       mode="multiple"
                       :getPopupContainer="triggerNode=> triggerNode.parentNode"

From d4a9dfa76e7e1e529d3a5404541a9bc33dfeabe1 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Wed, 19 Oct 2022 14:40:06 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=8A=A0log=20=E6=99=9A=E4=B8=8A=E7=9C=8B?=
 =?UTF-8?q?=E5=93=AA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarFileCompareItemCommentServiceImpl.java | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
index 4c9f4d6cf..cf7af7542 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
@@ -15,6 +15,7 @@ import com.jero.modules.compare.service.ISarFileCompareItemCommentService;
 import com.jero.modules.compare.service.ISarFileCompareItemService;
 import com.jero.modules.compare.utils.ConvertHtml2Excel;
 import com.jero.modules.system.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.poi.hssf.usermodel.*;
@@ -44,6 +45,7 @@ import java.util.*;
  * @Version: V1.0
  */
 @Service
+@Slf4j
 public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCompareItemCommentMapper, SarFileCompareItemComment> implements ISarFileCompareItemCommentService {
 
     @Autowired
@@ -243,14 +245,16 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
 
         OutputStream os = null;
         Workbook workbook = new HSSFWorkbook();
-
+        log.info("-------------- workbook创建成功 -----------------");
         //在本地创建图片文件夹
+        log.info("-------------- 在本地创建图片文件夹 -----------------");
         String dir = filePath + File.separator + UUID.randomUUID().toString().replace("-", "");
         File dirFile = new File(dir);
         if (dirFile.exists()){
             dirFile.delete();
         }
         dirFile.mkdirs();
+        log.info("-------------- 文件夹创建成功："+ dirFile.getAbsolutePath() +" -----------------");
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String fileName = "导出对比结果 " + sdf.format(new Date()) + ".xlsx";
@@ -308,7 +312,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                         row.createCell(1).setCellValue(itemLeft.getItemsNum());
                         row.createCell(2).setCellValue(itemLeft.getItemsName());
                         String text = itemLeft.getItemsText();
+                        log.info("-------------- 开始开始拆分左侧图片、文字、表格 :" + text + "-----------------");
                         String rowDataAndPath = getSplitContent(request, text);
+                        log.info("-------------- 左侧图片、文字、表格 拆分成功 :"+ rowDataAndPath +"-----------------");
                         leftSplit = rowDataAndPath.split("---");
                         if (leftSplit.length > 1) {
                             for (int j = 0; j < leftSplit.length; j++) {
@@ -319,9 +325,13 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                                         if (ObjectUtils.isEmpty(row2)) {
                                             row2 = sheet.createRow(j + i);
                                         }
+                                        log.info("-------------- 开始开始处理左侧图片、表格 -----------------");
                                         handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, leftSplit[j], 3);
+                                        log.info("-------------- 左侧图片、表格 处理成功 -----------------");
                                     } else {
+                                        log.info("-------------- 开始开始处理左侧图片、表格 -----------------");
                                         handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, leftSplit[j], 3);
+                                        log.info("-------------- 左侧图片、表格 处理成功 -----------------");
                                     }
                                 }
                             }
@@ -342,7 +352,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                         row.createCell(5).setCellValue(itemRight.getItemsNum());
                         row.createCell(6).setCellValue(itemRight.getItemsName());
                         String text = itemRight.getItemsText();
+                        log.info("-------------- 开始开始拆分右侧图片、文字、表格 :"+ text +" -----------------");
                         String rowDataAndPath = getSplitContent(request, text);
+                        log.info("-------------- 右侧图片、文字、表格 拆分成功 :"+ rowDataAndPath +" -----------------");
                         rightSplit = rowDataAndPath.split("---");
                         if (rightSplit.length > 1) {
                             for (int j = 0; j < rightSplit.length; j++) {
@@ -353,9 +365,13 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                                         if (ObjectUtils.isEmpty(row2)) {
                                             row2 = sheet.createRow(j + i);
                                         }
+                                        log.info("-------------- 开始处理右侧图片、表格 -----------------");
                                         handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, rightSplit[j], 7);
+                                        log.info("-------------- 右侧图片、表格 处理成功 -----------------");
                                     } else {
+                                        log.info("-------------- 开始处理右侧图片、表格 -----------------");
                                         handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, rightSplit[j], 7);
+                                        log.info("-------------- 右侧图片、表格 处理成功 -----------------");
                                     }
                                 }
                             }
@@ -392,12 +408,15 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                 row.getCell(1).setCellStyle(cellStyle);
             }
             if (ObjectUtils.isNotEmpty(mergeCells)) {
+                log.info("-------------- 开始处理需要合并的单元格 -----------------");
                 Set<SarFileCompareExcelMergeCell> mergeCellSet = new HashSet<>(mergeCells);
                 for (SarFileCompareExcelMergeCell mergeCell : mergeCellSet) {
                     Integer leftCount = mergeCell.getLeftEnd() - mergeCell.getLeftStart() + 1;
                     Integer rightCount = mergeCell.getRightEnd() - mergeCell.getRightStart() + 1;
                     Integer start = leftCount - rightCount >= 0 ? mergeCell.getLeftStart() : mergeCell.getRightStart();
+                    log.info("-------------- 合并开始行数：" + start + " -----------------");
                     Integer end = leftCount - rightCount >= 0 ? mergeCell.getLeftEnd() : mergeCell.getRightEnd();
+                    log.info("-------------- 合并结束行数: " + end + " -----------------");
                     //合并
                     CellRangeAddress region0 = new CellRangeAddress(start, end, 0, 0);
                     sheet.addMergedRegion(region0);
@@ -414,6 +433,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                     CellRangeAddress region7 = new CellRangeAddress(start, end, 8, 8);
                     sheet.addMergedRegion(region7);
                 }
+                log.info("-------------- 单元格合并成功 -----------------");
             }
 
 
@@ -449,6 +469,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
         if (text.contains("/upFiles")) {
             row.setHeight((short) 3000); //设置行高
             //先将图片下载到本地
+            log.info("-------------------------将图片下载到本地文件夹中----------------------------");
             String fileLastName = text.substring(text.lastIndexOf("/") + 1);
             if (CosBootUtil.doesObjectExist(text)) {
                 try (InputStream in = CosBootUtil.download(text)) {
@@ -459,18 +480,22 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                 }
             }
             File file = new File(dir + File.separator + fileLastName);
+            log.info("-------------------------图片下载成功:"+  file.getAbsolutePath() +"----------------------------");
             if (file.exists()) {
+                log.info("-------------------------将图片插入excel指定单元格中----------------------------");
                 BufferedImage bufferImg = ImageIO.read(file);
                 ImageIO.write(bufferImg, "jpg", byteArrayOut);
                 //anchor主要用于设置图片的属性
                 HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 600, 200, (short) cellNum, j + i, (short) cellNum, j + i);
                 patriarch.createPicture(anchor, workbook.addPicture(byteArrayOut.toByteArray(), HSSFWorkbook.PICTURE_TYPE_JPEG));
-
+                log.info("-------------------------将图片插入成功----------------------------");
             }
         } else {
             Cell cell = row.createCell(cellNum);
             if (text.contains("<table")) {
+                log.info("-------------------------开始处理表格----------------------------");
                 tableAssociate(workbook, cellStyleLink, cell, text);
+                log.info("-------------------------表格处理完毕----------------------------");
             } else {
                 cell.setCellValue(text);
             }
@@ -487,6 +512,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
     private void tableAssociate(Workbook workbook, CellStyle cellStyleLink, Cell cell, String tableHtml) {
         cell.setCellValue("点击查看详情");
         //新开sheet生成表格
+        log.info("-------------------------开始生成表格----------------------------");
         if (org.apache.commons.lang.StringUtils.isNotEmpty(tableHtml) && tableHtml.indexOf("<tbody>") < 0) {
             if (tableHtml.indexOf("<thead>") < 0) {
                 tableHtml = tableHtml.replaceFirst("<tr>", "<tbody><tr>");
@@ -500,13 +526,16 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
         tableHtml = tableHtml.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt);
         String tableSheetName = "表格" + System.currentTimeMillis();
         ConvertHtml2Excel.table2Excel(tableHtml, (HSSFWorkbook) workbook, tableSheetName);
+        log.info("-------------------------表格生产完毕----------------------------");
         //添加超链接
+        log.info("-------------------------开始添加超链接---------------------------");
         CreationHelper createHelper = workbook.getCreationHelper();
         Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.DOCUMENT);
         String tableName = "#\'" + tableSheetName + "\'!A1";
         hyperlink1.setAddress(tableName);
         cell.setHyperlink(hyperlink1);// 链接
         cell.setCellStyle(cellStyleLink);
+        log.info("-------------------------超链接添加完毕---------------------------");
     }
 
     /**
@@ -518,11 +547,15 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
     private String getSplitContent(HttpServletRequest request, String text) {
         text = text.replace("<p>", "").replace("</p>", "\r\n");
         //分割图片
+        log.info("-------------------------开始分割文字与图片---------------------------");
         splitImg(text, request.getSession());
+        log.info("-------------------------文字与图片分割完毕---------------------------");
         //分割表格
+        log.info("-------------------------从剩余文字中开始分割表格---------------------------");
         String txtAndImg = (String) request.getSession().getAttribute("txtAndImg");
         txtAndImg = txtAndImg.replaceAll("table", "replaceTable");
         splitTable(txtAndImg, request.getSession());
+        log.info("-------------------------表格分割完毕---------------------------");
         return (String) request.getSession().getAttribute("textAndTableAndImg");
     }
 

From ceeeeff41dfea2a02a02f4cec11eb3628bb1d1af Mon Sep 17 00:00:00 2001
From: gaosong <gaosong@syxysoft.com>
Date: Wed, 19 Oct 2022 14:55:37 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9PDF=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/modules/system/util/PDFUtils.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/PDFUtils.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/PDFUtils.java
index c83b6776c..9738325ef 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/PDFUtils.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/PDFUtils.java
@@ -17,6 +17,7 @@ import java.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.io.*;
+import java.lang.reflect.Field;
 
 @Slf4j
 public class PDFUtils {
@@ -217,7 +218,10 @@ public class PDFUtils {
             String path = uploadpath + File.separator + fileName;
             newFilePath = path.replace(fileName, "transformation" + fileName);
             reader = new PdfReader(byes);
-
+            //解密文件
+            Field f = PdfReader.class.getDeclaredField("ownerPasswordUsed");
+            f.setAccessible(true);
+            f.set(reader, Boolean.TRUE);
             // 加完水印的文件
             os = new FileOutputStream(newFilePath);
             stamper = new PdfStamper(reader, os);
@@ -286,6 +290,11 @@ public class PDFUtils {
             e.printStackTrace();
             log.error(e.getMessage());
 
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+        }catch (NoSuchFieldException e) {
+            e.printStackTrace();
         } finally {
             try {
                 stamper.close();

From b42064c67d65ba8654f6527b5761b3b5aaa0ea82 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Wed, 19 Oct 2022 15:22:15 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=9A=84=E9=80=82=E7=94=A8=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulationReport/components/modules/defaultTemplate.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
index a7d4b6823..77c7b37cf 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
@@ -98,7 +98,7 @@
                                 :placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
                                 :type="'checkbox'"
                                 :disabled="disabled"
-                                :triggerChange="false" :dictCode="'apply_scope'"/>
+                                :triggerChange="false" :dictCode="'fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2'"/>
           </a-form-model-item>
         </div>
       </a-col>

From 001907158dad1ec0de921b31786c31b52664db86 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Wed, 19 Oct 2022 15:33:10 +0800
Subject: [PATCH 7/8] e.printStackTrace

---
 .../service/impl/SarFileCompareItemCommentServiceImpl.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
index cf7af7542..98d61b826 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
@@ -441,6 +441,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
             workbook.write(os);
             os.flush();
         } catch (IOException e) {
+            e.printStackTrace();
             if (CutEnum.CN.getValue().equals(cut)) {
                 throw new JeroBootException("下载文件失败");
             } else {

From 9946a9efd4ef1ee63d58b7ced36dde90cc92b321 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 19 Oct 2022 15:44:10 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5--?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/report/entity/LawsMonthlyReportWriteEO.java    | 2 +-
 .../java/com/jero/modules/report/enums/DictCodeReportEnum.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
index 2563e41b4..11892a582 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
@@ -116,7 +116,7 @@ public class LawsMonthlyReportWriteEO implements Serializable {
 	/**适用范围*/
 	@Excel(name = "适用范围", width = 15)
     @ApiModelProperty(value = "适用范围")
-    @Dict(dicCode ="apply_scope")
+    @Dict(dicCode ="fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2")
     private java.lang.String applyScope;
 
 	/**状态*/
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java
index 7aea0d69d..5e6d09401 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java
@@ -8,7 +8,7 @@ package com.jero.modules.report.enums;
  */
 public enum DictCodeReportEnum {
     APPLYCAR("适用车型","car_type"),
-    APPLYSCOPE("适用范围","apply_scope"),
+    APPLYSCOPE("适用范围","fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2"),
     STATE("状态","state"),
     USEMETHOD("用法","yong4_fa3");