From a091e7948524d2b0145a35e417c4b8715f04b18d Mon Sep 17 00:00:00 2001
From: gaosong <gaosong@syxysoft.com>
Date: Tue, 9 Aug 2022 11:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94-=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarFileCompareItemCommentServiceImpl.java | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 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 9d721509b..2b4646201 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
@@ -21,10 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description: 文档对比信息条款评论表
@@ -168,13 +165,19 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
 
     @Override
     public void exportResXls(HttpServletResponse response, String infoId, String selectIds, boolean includeComments, String cut) {
-        LambdaQueryWrapper<SarFileCompareItemComment> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SarFileCompareItemComment::getInfoId, infoId);
-        if (!StringUtils.isEmpty(selectIds)) {
-            queryWrapper.in(SarFileCompareItemComment::getId, Arrays.asList(selectIds.split(",")));
+        List<SarFileCompareItemComment> list = null;
+        if (includeComments && StringUtils.isEmpty(selectIds)) {
+            //只导出全文评论的情况
+            list = new ArrayList<>();
+        } else {
+            LambdaQueryWrapper<SarFileCompareItemComment> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(SarFileCompareItemComment::getInfoId, infoId);
+            if (!StringUtils.isEmpty(selectIds)) {
+                queryWrapper.in(SarFileCompareItemComment::getId, Arrays.asList(selectIds.split(",")));
+            }
+            queryWrapper.orderBy(true, true, SarFileCompareItemComment::getCreateTime);
+            list = this.list(queryWrapper);
         }
-        queryWrapper.orderBy(true, true, SarFileCompareItemComment::getCreateTime);
-        List<SarFileCompareItemComment> list = this.list(queryWrapper);
         Map<String, SarFileCompareItem> sfcItemMap = SarFileCompareItemServiceImpl.queryMapByInfoId(infoId);
 
         OutputStream os = null;
@@ -230,7 +233,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                 row.createCell(6).setCellValue(itemComment.getComment());
                 i++;
             }
-            if (includeComments) {
+            if (includeComments || StringUtils.isEmpty(selectIds)) {
                 Row row = sheet.createRow(i);
                 if (CutEnum.CN.getValue().equals(cut)) {
                     row.createCell(0).setCellValue("全文评论");