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 a99fd0a602..012d1eac9a 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
@@ -1131,7 +1131,7 @@ public class ChartDataBuild {
                     if (StringUtils.isEmpty(originStr) || originStr.length() <= columnPermissionItem.getDesensitizationRule().getM() + columnPermissionItem.getDesensitizationRule().getN() + 1) {
                         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() - 1);
+                        desensitizationStr = StringUtils.substring(originStr, 0, columnPermissionItem.getDesensitizationRule().getM()) + "***" + StringUtils.substring(originStr, originStr.length() - columnPermissionItem.getDesensitizationRule().getN() - 1, originStr.length());
                     }
                     break;
                 case RetainMToN:
diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 64ae69795d..5ec60f03b9 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -1304,7 +1304,7 @@ public class ExtractDataService {
         userDefinedJavaClassMeta.setFieldInfo(fields);
         List<UserDefinedJavaClassDef> definitions = new ArrayList<>();
         String tmp_code = code.replace("handleWraps", handleWraps).replace("handleBinaryType", handleBinaryTypeCode.toString());
-        if (!isSetKey) {
+        if (isSetKey) {
             tmp_code = tmp_code.replace("handleDataease_uuid", "");
         } else {
             tmp_code = tmp_code.replace("handleDataease_uuid", handleDataease_uuid);