From f6f103c4891f92c2a7aa804b0d205a258e26c698 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 29 Apr 2024 15:38:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E7=BB=99=E6=88=91=E7=9A=84=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=E8=BF=9B=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=AD=E5=BF=83=E6=B2=A1=E6=9C=89=E7=9C=8B?= =?UTF-8?q?=E5=88=B0=E5=AF=BC=E5=87=BA=E7=9A=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/util/ChartDataBuild.java | 4 ++-- .../dataease/service/exportCenter/ExportCenterService.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java index 1a9037c5cf..309258a8f2 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java +++ b/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java @@ -1136,10 +1136,10 @@ public class ChartDataBuild { } else { switch (columnPermissionItem.getDesensitizationRule().getCustomBuiltInRule()) { case RetainBeforeMAndAfterN: - if (StringUtils.isEmpty(originStr) || originStr.length() <= columnPermissionItem.getDesensitizationRule().getM() + columnPermissionItem.getDesensitizationRule().getN() + 1) { + if (StringUtils.isEmpty(originStr) || originStr.length() < columnPermissionItem.getDesensitizationRule().getM() + columnPermissionItem.getDesensitizationRule().getN()) { desensitizationStr = String.join("", Collections.nCopies(columnPermissionItem.getDesensitizationRule().getM(), "X")) + "***" + String.join("", Collections.nCopies(columnPermissionItem.getDesensitizationRule().getN(), "X")); } else { - desensitizationStr = StringUtils.substring(originStr, 0, columnPermissionItem.getDesensitizationRule().getM()) + "***" + StringUtils.substring(originStr, originStr.length() - columnPermissionItem.getDesensitizationRule().getN() - 1, originStr.length()); + desensitizationStr = StringUtils.substring(originStr, 0, columnPermissionItem.getDesensitizationRule().getM()) + "***" + StringUtils.substring(originStr, originStr.length() - columnPermissionItem.getDesensitizationRule().getN(), originStr.length()); } break; case RetainMToN: diff --git a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java index c737282731..943dd4f24f 100644 --- a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java +++ b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java @@ -1,6 +1,7 @@ package io.dataease.service.exportCenter; import com.google.gson.Gson; +import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.commons.constants.ParamConstants; import io.dataease.commons.constants.SysLogConstants; import io.dataease.commons.utils.*; @@ -50,6 +51,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; @@ -362,7 +364,8 @@ public class ExportCenterService { public void addTask(String exportFrom, String exportFromType, PanelViewDetailsRequest request) { ExportTask exportTask = new ExportTask(); exportTask.setId(UUID.randomUUID().toString()); - exportTask.setUserId(AuthUtils.getUser().getUserId()); + CurrentUserDto u = (CurrentUserDto) SecurityUtils.getSubject().getPrincipal(); + exportTask.setUserId(u.getUserId()); exportTask.setExportFrom(exportFrom); exportTask.setExportFromType(exportFromType); exportTask.setExportStatus("PENDING");