From 0a0a38c9d7bc215abcd3a51162921cc00abd0d60 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 29 Jul 2021 19:14:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90->=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E7=AE=A1=E7=90=86=E6=8B=A5=E6=9C=89[?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90]=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E7=9A=84=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtDataSetTaskMapper.xml  |  7 +++--
 .../base/mapper/ext/query/GridExample.java    |  3 ++
 .../dataease/dto/dataset/DataSetTaskDTO.java  |  1 +
 .../dataset/DataSetTableTaskLogService.java   |  8 ++++++
 .../dataset/DataSetTableTaskService.java      |  9 ++++++
 .../src/views/chart/view/TableSelector.vue    |  7 ++++-
 .../common/DatasetGroupSelectorTree.vue       | 28 +++++++++++++------
 .../src/views/dataset/data/UpdateInfo.vue     |  7 +----
 .../src/views/system/task/DatasetTaskList.vue | 20 ++++++-------
 9 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml
index 88b361896c..02682072d7 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml
@@ -10,12 +10,13 @@
 
     <resultMap id="TaskResult" type="io.dataease.dto.dataset.DataSetTaskDTO" extends="io.dataease.base.mapper.DatasetTableTaskMapper.BaseResultMap">
         <result column="table_name" jdbcType="VARCHAR" property="datasetName"/>
+        <result column="privileges" jdbcType="VARCHAR" property="privileges"/>
         <result column="NEXT_FIRE_TIME" jdbcType="BIGINT" property="nextExecTime"/>
     </resultMap>
 
     <select id="list" resultMap="BaseResult" parameterType="io.dataease.base.domain.DatasetTableTaskLog">
         SELECT dataset_table_task_log.*, dataset_table_task.name, dataset_table.name as dataset_name
-        FROM dataset_table_task_log
+        FROM (select GET_V_AUTH_MODEL_WITH_PRIVILEGE (#{extendCondition}, 'dataset',1) cids) t, dataset_table_task_log
         LEFT JOIN dataset_table_task ON dataset_table_task_log.task_id = dataset_table_task.id
         LEFT JOIN dataset_table ON dataset_table_task_log.table_id = dataset_table.id
         <if test="_parameter != null">
@@ -30,8 +31,8 @@
     </select>
 
     <select id="taskList" resultMap="TaskResult" parameterType="io.dataease.base.mapper.ext.query.GridExample">
-        SELECT dataset_table.name as table_name, dataset_table_task.* , qrtz_triggers.*
-        FROM dataset_table_task
+        SELECT dataset_table.name as table_name, get_auths(dataset_table_task.table_id,'dataset', #{extendCondition}) as `privileges`,dataset_table_task.* , qrtz_triggers.NEXT_FIRE_TIME
+        FROM (select GET_V_AUTH_MODEL_WITH_PRIVILEGE (#{extendCondition}, 'dataset', 1) cids) t, dataset_table_task
         left join dataset_table on dataset_table.id=dataset_table_task.table_id
         left join qrtz_triggers on dataset_table_task.id=qrtz_triggers.TRIGGER_NAME
         <if test="_parameter != null">
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java b/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java
index 1c4530cdc1..58a38660ef 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java
@@ -171,6 +171,9 @@ public class GridExample {
                 case "not null":
                     addNotNullCriterion(field + " is not null ");
                     break;
+                case "extra":
+                    addCriterion(field);
+                    break;
             }
             return (Criteria) this;
         }
diff --git a/backend/src/main/java/io/dataease/dto/dataset/DataSetTaskDTO.java b/backend/src/main/java/io/dataease/dto/dataset/DataSetTaskDTO.java
index c5128c49bb..e14ef6c4d4 100644
--- a/backend/src/main/java/io/dataease/dto/dataset/DataSetTaskDTO.java
+++ b/backend/src/main/java/io/dataease/dto/dataset/DataSetTaskDTO.java
@@ -15,4 +15,5 @@ public class DataSetTaskDTO extends DatasetTableTask {
     private Long nextExecTime;
     private String taskStatus;
     private String msg;
+    private String privileges;
 }
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java
index 3221c107b2..d0f5641311 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java
@@ -5,6 +5,7 @@ import io.dataease.base.domain.DatasetTableTaskLogExample;
 import io.dataease.base.mapper.DatasetTableTaskLogMapper;
 import io.dataease.base.mapper.ext.ExtDataSetTaskMapper;
 import io.dataease.base.mapper.ext.query.GridExample;
+import io.dataease.commons.utils.AuthUtils;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.base.ConditionEntity;
 import io.dataease.dto.dataset.DataSetTaskDTO;
@@ -56,10 +57,17 @@ public class DataSetTableTaskLogService {
                 conditionEntities = new ArrayList<>();
             }
             conditionEntities.add(entity);
+
+            ConditionEntity entity2 = new ConditionEntity();
+            entity2.setOperator("extra");
+            entity2.setField(" FIND_IN_SET(dataset_table_task_log.table_id,cids) ");
+            conditionEntities.add(entity2);
+
             request.setConditions(conditionEntities);
         }
 
         GridExample gridExample = request.convertExample();
+        gridExample.setExtendCondition(AuthUtils.getUser().getUserId().toString());
         List<DataSetTaskLogDTO> dataSetTaskLogDTOS = extDataSetTaskMapper.list(gridExample);
         dataSetTaskLogDTOS.forEach(dataSetTaskLogDTO -> {
             if(StringUtils.isEmpty(dataSetTaskLogDTO.getName())){
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
index 83af70f621..b60935b095 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
@@ -10,6 +10,7 @@ import io.dataease.commons.constants.JobStatus;
 import io.dataease.commons.constants.ScheduleType;
 import io.dataease.commons.constants.TaskStatus;
 import io.dataease.commons.constants.TriggerType;
+import io.dataease.commons.utils.AuthUtils;
 import io.dataease.controller.request.dataset.DataSetTaskRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.base.ConditionEntity;
@@ -26,6 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
@@ -213,7 +215,14 @@ public class DataSetTableTaskService {
     }
 
     public List<DataSetTaskDTO> taskList(BaseGridRequest request) {
+        List<ConditionEntity> conditionEntities = request.getConditions() == null ? new ArrayList<>() : request.getConditions();
+        ConditionEntity entity = new ConditionEntity();
+        entity.setOperator("extra");
+        entity.setField(" FIND_IN_SET(dataset_table_task.table_id,cids) ");
+        conditionEntities.add(entity);
+        request.setConditions(conditionEntities);
         GridExample gridExample = request.convertExample();
+        gridExample.setExtendCondition(AuthUtils.getUser().getUserId().toString());
         List<DataSetTaskDTO> dataSetTaskDTOS = extDataSetTaskMapper.taskList(gridExample);
         return dataSetTaskDTOS;
     }
diff --git a/frontend/src/views/chart/view/TableSelector.vue b/frontend/src/views/chart/view/TableSelector.vue
index 3c6c46f71e..53ac2d5629 100644
--- a/frontend/src/views/chart/view/TableSelector.vue
+++ b/frontend/src/views/chart/view/TableSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <de-container>
     <de-aside-container>
-      <dataset-group-selector-tree @getTable="getTable" :mode=mode :type=type :customType=customType :showMode=showMode />
+      <dataset-group-selector-tree @getTable="getTable" :privileges=privileges :mode=mode :type=type :customType=customType :showMode=showMode />
     </de-aside-container>
     <de-main-container>
       <dataset-table-data :table="table" />
@@ -45,6 +45,11 @@ export default {
       required: false,
       default: null
     },
+    privileges: {
+      type: String,
+      required: false,
+      default: 'use'
+    }
   },
   data() {
     return {
diff --git a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
index a06512e7bd..a8d151cffb 100644
--- a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
+++ b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
@@ -69,6 +69,7 @@
 <script>
 import { isKettleRunning, post } from '@/api/dataset/dataset'
 import { authModel } from '@/api/system/sysAuth'
+import { hasDataPermission } from '@/utils/permission'
 
 export default {
   name: 'DatasetGroupSelectorTree',
@@ -112,6 +113,11 @@ export default {
       type: String,
       required: false,
       default: null
+    },
+    privileges: {
+      type: String,
+      required: false,
+      default: 'use'
     }
   },
   data() {
@@ -236,10 +242,12 @@ export default {
           mode: this.mode < 0 ? null : this.mode,
           typeFilter: this.customType ? this.customType : null
         }, false).then(response => {
-          this.tables = response.data
-          for (let i = 0; i < this.tables.length; i++) {
-            if (this.tables[i].mode === 1 && this.kettleRunning === false) {
-              this.$set(this.tables[i], 'disabled', true)
+          for (let i = 0; i < response.data.length; i++) {
+            if (response.data[i].mode === 1 && this.kettleRunning === false) {
+              this.$set(response.data[i], 'disabled', true)
+            }
+            if(hasDataPermission(this.privileges, response.data[i].privileges)){
+              this.tables.push(response.data[i])
             }
           }
           this.tableData = JSON.parse(JSON.stringify(this.tables))
@@ -350,14 +358,16 @@ export default {
             type: this.type,
             typeFilter: this.customType ? this.customType : null
           }, false).then(response => {
-            this.tables = response.data
-            for (let i = 0; i < this.tables.length; i++) {
-              if (this.tables[i].mode === 1 && this.kettleRunning === false) {
-                this.$set(this.tables[i], 'disabled', true)
+            for (let i = 0; i < response.data.length; i++) {
+              if (response.data[i].mode === 1 && this.kettleRunning === false) {
+                this.$set(response.data[i], 'disabled', true)
+              }
+              if(hasDataPermission(this.privileges, response.data[i].privileges)){
+                this.tables.push(response.data[i])
               }
             }
-            this.tableData = JSON.parse(JSON.stringify(this.tables))
 
+            this.tableData = JSON.parse(JSON.stringify(this.tables))
             this.$nextTick(function() {
               this.unionDataChange()
             })
diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index 1ba0a51c7f..a60d04999c 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -533,12 +533,7 @@ export default {
             this.incrementalConfig.incrementalDelete = this.sql
           }
           this.incrementalConfig.tableId = this.table.id
-          let startTime = new Date(task.startTime).getTime()
-          if(startTime < new Date().getTime()){
-            startTime = new Date().getTime()
-          }
-          task.startTime = startTime
-
+          task.startTime = new Date(task.startTime).getTime()
           task.endTime = new Date(task.endTime).getTime()
           task.tableId = this.table.id
           const form = JSON.parse(JSON.stringify(task))
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index c07cffd1a8..be3c8c0ed1 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -168,7 +168,7 @@
 
     <!--添加任务-选择数据集-->
     <el-dialog v-dialogDrag :title="$t('dataset.task.create')" :visible="selectDatasetFlag" :show-close="false" width="70%" class="dialog-css" :destroy-on-close="true">
-      <table-selector @getTable="getTable" :mode="1" :customType=customType  showMode="datasetTask"/>
+      <table-selector @getTable="getTable" privileges="manage" :mode="1" :customType=customType  showMode="datasetTask"/>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeCreateTask">{{ $t('chart.cancel') }}</el-button>
         <el-button type="primary" size="mini" :disabled="!table.id" @click="create(undefined)">{{ $t('chart.confirm') }}</el-button>
@@ -215,6 +215,7 @@ import 'codemirror/addon/hint/sql-hint'
 import 'codemirror/addon/hint/show-hint'
 import cron from '@/components/cron/cron'
 import TableSelector from '@/views/chart/view/TableSelector'
+import { hasDataPermission } from '@/utils/permission'
 
 export default {
   name: 'DatasetTaskList',
@@ -255,7 +256,7 @@ export default {
           label: this.$t('dataset.task.exec'), icon: 'el-icon-video-play', type: 'success', click: this.execTask, disabled: this.disableExec
         },
         {
-          label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.deleteTask
+          label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.deleteTask, disabled: this.disableDelete
         }
       ],
       searchConfig: {
@@ -551,10 +552,14 @@ export default {
       this.taskForm.cron = val
     },
     disableEdit(task) {
-      return task.rate === 'SIMPLE' || task.status === 'Stopped'
+      return task.rate === 'SIMPLE' || task.status === 'Stopped' || !hasDataPermission('manage',task.privileges)
     },
     disableExec(task) {
-      return task.status === 'Stopped' || task.status === 'Pending' || task.rate === 'SIMPLE'
+      return task.status === 'Stopped' || task.status === 'Pending' || task.rate === 'SIMPLE' || !hasDataPermission('manage',task.privileges)
+    },
+    disableDelete(task) {
+      return false;
+      // !hasDataPermission('manage',task.privileges)
     },
     deleteTask(task) {
       this.$confirm(this.$t('dataset.confirm_delete'), this.$t('dataset.tips'), {
@@ -620,12 +625,7 @@ export default {
             }
             this.incrementalConfig.tableId = task.tableId
           }
-
-          let startTime = new Date(task.startTime).getTime()
-          if(startTime < new Date().getTime()){
-            startTime = new Date().getTime()
-          }
-          task.startTime = startTime
+          task.startTime = new Date(task.startTime).getTime()
           task.endTime = new Date(task.endTime).getTime()
           const form = JSON.parse(JSON.stringify(task))
           form.extraData = JSON.stringify(form.extraData)