From fc3b3cec3a4f7981d551015669dd6c48e8d66b8f Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 20 Dec 2023 17:00:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=90=8C=E6=AD=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/chart/utils/ChartDataBuild.java     | 9 ++++-----
 .../java/io/dataease/job/sechedule/DeScheduleJob.java    | 2 +-
 .../visualized/data/datasource/form/CreatDsGroup.vue     | 3 +++
 .../visualized/data/datasource/form/EditorDetail.vue     | 4 ++--
 4 files changed, 10 insertions(+), 8 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 21d99e6ed7..7dfa8e7fe1 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
@@ -1105,14 +1105,13 @@ public class ChartDataBuild {
                         desensitizationStr = "*** ***";
                         break;
                     }
-                    if (originStr.length() >= columnPermissionItem.getDesensitizationRule().getM() && originStr.length() >= columnPermissionItem.getDesensitizationRule().getN()) {
+                    if (columnPermissionItem.getDesensitizationRule().getM() == 1) {
                         desensitizationStr = StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, columnPermissionItem.getDesensitizationRule().getN()) + "***";
                         break;
+                    } else {
+                        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());
-                    }
-                    break;
                 default:
                     break;
 
diff --git a/core/core-backend/src/main/java/io/dataease/job/sechedule/DeScheduleJob.java b/core/core-backend/src/main/java/io/dataease/job/sechedule/DeScheduleJob.java
index 811e9a95c7..a6336d567a 100644
--- a/core/core-backend/src/main/java/io/dataease/job/sechedule/DeScheduleJob.java
+++ b/core/core-backend/src/main/java/io/dataease/job/sechedule/DeScheduleJob.java
@@ -18,7 +18,7 @@ public abstract class DeScheduleJob implements Job {
         this.expression = jobDataMap.getString("expression");
         this.taskId = jobDataMap.getLong("taskId");
         this.updateType = jobDataMap.getString("updateType");
-        LogUtil.info(jobKey.getGroup() + " Running: " + datasetTableId);
+        LogUtil.info(jobKey.getName() + " Running: " + datasetTableId);
         LogUtil.info("CronExpression: " + expression);
         businessExecute(context);
     }
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue b/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
index 34e07bbc24..d2bc652a71 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
@@ -257,6 +257,9 @@ const saveDataset = () => {
       if (cmd.value === 'move' && !checkPid(params.pid)) {
         return
       }
+      if (loading.value) {
+        return
+      }
       loading.value = true
       if (request) {
         let options = {
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
index d6a9bedd14..be1483eed1 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
@@ -125,7 +125,7 @@ const initForm = type => {
       startTime: '',
       endTime: '',
       endLimit: '0',
-      cron: '0 0 0/1 *  * ? *'
+      cron: '0 0/1 * * * ? *'
     }
   }
   if (type === 'oracle') {
@@ -362,7 +362,7 @@ const onRateChange = () => {
     form.value.syncSetting.cron = ''
   }
   if (form.value.syncSetting.syncRate === 'SIMPLE_CRON') {
-    form.value.syncSetting.cron = '0 0 0/1 *  * ? *'
+    form.value.syncSetting.cron = '0 0/1 * * * ? *'
     form.value.syncSetting.simpleCronType = 'minute'
   }
   if (form.value.syncSetting.syncRate === 'CRON') {