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 queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SarFileCompareItemComment::getInfoId, infoId); - if (!StringUtils.isEmpty(selectIds)) { - queryWrapper.in(SarFileCompareItemComment::getId, Arrays.asList(selectIds.split(","))); + List list = null; + if (includeComments && StringUtils.isEmpty(selectIds)) { + //只导出全文评论的情况 + list = new ArrayList<>(); + } else { + LambdaQueryWrapper 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 list = this.list(queryWrapper); Map sfcItemMap = SarFileCompareItemServiceImpl.queryMapByInfoId(infoId); OutputStream os = null; @@ -230,7 +233,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl