From 65ae8e84b43d05cea1986ef11ef5bd71792d987e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 25 Oct 2023 15:58:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E8=84=B1?=
 =?UTF-8?q?=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/chart/utils/ChartDataBuild.java   |  4 ++--
 .../io/dataease/datasource/provider/ExcelUtils.java    |  5 ++++-
 .../dataease/datasource/server/DatasourceServer.java   | 10 ++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java
index b0c2eba9d0..a4ca90c54a 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java
@@ -1106,11 +1106,11 @@ public class ChartDataBuild {
                         break;
                     }
                     if (originStr.length() >= columnPermissionItem.getDesensitizationRule().getM() && originStr.length() >= columnPermissionItem.getDesensitizationRule().getN()) {
-                        desensitizationStr = StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, columnPermissionItem.getDesensitizationRule().getN()) + "***";
+                        desensitizationStr = "***" + StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, columnPermissionItem.getDesensitizationRule().getN()) + "***";
                         break;
                     }
                     if (originStr.length() >= columnPermissionItem.getDesensitizationRule().getM() && originStr.length() < columnPermissionItem.getDesensitizationRule().getN()) {
-                        desensitizationStr = StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, originStr.length()) + "***";
+                        desensitizationStr = "***" + StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, originStr.length());
                     }
                     break;
                 default:
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
index a53682a812..b4c3059602 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
 
 
 public class ExcelUtils {
-
+    public static final String UFEFF = "\uFEFF";
     private static String path = "/opt/dataease/data/excel/";
     private static ObjectMapper objectMapper = new ObjectMapper();
 
@@ -450,6 +450,9 @@ public class ExcelUtils {
                 if(StringUtils.isEmpty(filedName)){
                     DEException.throwException("首行行中不允许有空单元格！");
                 }
+                if (filedName.startsWith(UFEFF)) {
+                    filedName = filedName.replace(UFEFF, "");
+                }
                 TableField tableFiled = new TableField();
                 tableFiled.setName(filedName);
                 tableFiled.setOriginName(filedName);
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
index ec90781cfc..954dd2d05c 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
@@ -144,8 +144,10 @@ public class DatasourceServer implements DatasourceApi {
     private void filterDs(List<BusiNodeVO> busiNodeVOS, List<Long> ids, String type, Long id) {
         for (BusiNodeVO busiNodeVO : busiNodeVOS) {
             if (busiNodeVO.getType() != null && busiNodeVO.getType().equalsIgnoreCase(type)) {
-                if (id != null && !busiNodeVO.getId().equals(id)) {
-                    ids.add(busiNodeVO.getId());
+                if (id != null) {
+                    if (!busiNodeVO.getId().equals(id)) {
+                        ids.add(busiNodeVO.getId());
+                    }
                 } else {
                     ids.add(busiNodeVO.getId());
                 }
@@ -166,7 +168,7 @@ public class DatasourceServer implements DatasourceApi {
         List<Long> ids = new ArrayList<>();
         filterDs(busiNodeVOS, ids, dataSourceDTO.getType(), dataSourceDTO.getId());
 
-        if(CollectionUtil.isEmpty(ids)){
+        if (CollectionUtil.isEmpty(ids)) {
             return false;
         }
         QueryWrapper<CoreDatasource> wrapper = new QueryWrapper<>();
@@ -181,7 +183,7 @@ public class DatasourceServer implements DatasourceApi {
         boolean hasRepeat = false;
         for (CoreDatasource datasource : datasources) {
             if (Arrays.asList("API", "Excel", "folder").contains(datasource.getType())) {
-               continue;
+                continue;
             }
             DatasourceConfiguration compare = JsonUtil.parseObject(datasource.getConfiguration(), DatasourceConfiguration.class);
             switch (dataSourceDTO.getType()) {