From b2cfbe20d09504d9d8ee934b031013f1d590e80b Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Fri, 28 Oct 2022 13:00:51 +0800 Subject: [PATCH 1/2] bug --- .../SarFileCompareItemCommentServiceImpl.java | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 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 f7268d40f..6558c077b 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 @@ -419,27 +419,36 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl mergeCellSet = new HashSet<>(mergeCells); for (SarFileCompareExcelMergeCell mergeCell : mergeCellSet) { - Integer leftCount = mergeCell.getLeftEnd() - mergeCell.getLeftStart() + 1; - Integer rightCount = mergeCell.getRightEnd() - mergeCell.getRightStart() + 1; + Integer leftCount = 0; + if (ObjectUtils.isNotEmpty(mergeCell.getLeftEnd())&&ObjectUtils.isNotEmpty(mergeCell.getLeftStart())) { + leftCount = mergeCell.getLeftEnd() - mergeCell.getLeftStart() + 1; + } + Integer rightCount = 0; + if (ObjectUtils.isNotEmpty(mergeCell.getRightEnd())&&ObjectUtils.isNotEmpty(mergeCell.getRightStart())) { + 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); - CellRangeAddress region1 = new CellRangeAddress(start, end, 1, 1); - sheet.addMergedRegion(region1); - CellRangeAddress region2 = new CellRangeAddress(start, end, 2, 2); - sheet.addMergedRegion(region2); - CellRangeAddress region4 = new CellRangeAddress(start, end, 4, 4); - sheet.addMergedRegion(region4); - CellRangeAddress region5 = new CellRangeAddress(start, end, 5, 5); - sheet.addMergedRegion(region5); - CellRangeAddress region6 = new CellRangeAddress(start, end, 6, 6); - sheet.addMergedRegion(region6); - CellRangeAddress region7 = new CellRangeAddress(start, end, 8, 8); - sheet.addMergedRegion(region7); + if (ObjectUtils.isNotEmpty(start)&&ObjectUtils.isNotEmpty(end)) { + CellRangeAddress region0 = new CellRangeAddress(start, end, 0, 0); + sheet.addMergedRegion(region0); + CellRangeAddress region1 = new CellRangeAddress(start, end, 1, 1); + sheet.addMergedRegion(region1); + CellRangeAddress region2 = new CellRangeAddress(start, end, 2, 2); + sheet.addMergedRegion(region2); + CellRangeAddress region4 = new CellRangeAddress(start, end, 4, 4); + sheet.addMergedRegion(region4); + CellRangeAddress region5 = new CellRangeAddress(start, end, 5, 5); + sheet.addMergedRegion(region5); + CellRangeAddress region6 = new CellRangeAddress(start, end, 6, 6); + sheet.addMergedRegion(region6); + CellRangeAddress region7 = new CellRangeAddress(start, end, 8, 8); + sheet.addMergedRegion(region7); + } + } log.info("-------------- 单元格合并成功 -----------------"); } From b2b92f62e46ccaa82b80c2d81d8e7c7074610ad7 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 28 Oct 2022 15:11:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=B7=BB=E5=8A=A0=E4=B8=8D=E8=83=BD=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=A9=BA=E6=9D=A1=E4=BB=B6=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/globalAdvancedQuery/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index 1d414485c..3bce861ad 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -397,7 +397,7 @@ return str }, handleOk() { - // if (!this.isNullArray(this.queryParamsModel)) { + if (!this.isNullArray(this.queryParamsModel)) { let event = { matchType: this.matchType, params: this.removeEmptyObject(this.queryParamsModel) @@ -407,9 +407,9 @@ this.visible = false } this.emitCallback(event) - // } else { - // this.$message.warn(this.$t('CannotQueryEmpty')) - // } + } else { + this.$message.warn(this.$t('CannotQueryEmpty')) + } }, emitCallback(event = {}) { let { params = [], matchType = this.matchType } = event