From 5f940920052c714ac47e362a06557e7730a2e44e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 9 Oct 2024 10:42:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20[Bug]=20v1=20=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20->=20=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=B8=8D=E5=87=BA=E6=9D=A5=20#12323?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/request/DatasetTaskGridRequest.java       |  2 ++
 .../java/io/dataease/ext/ExtDataSetTaskMapper.java    |  2 ++
 .../java/io/dataease/ext/ExtDataSetTaskMapper.xml     |  7 +++++--
 .../service/dataset/DataSetTableTaskService.java      | 11 ++++++++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/controller/dataset/request/DatasetTaskGridRequest.java b/core/backend/src/main/java/io/dataease/controller/dataset/request/DatasetTaskGridRequest.java
index c3e5654e33..886bfd5a25 100644
--- a/core/backend/src/main/java/io/dataease/controller/dataset/request/DatasetTaskGridRequest.java
+++ b/core/backend/src/main/java/io/dataease/controller/dataset/request/DatasetTaskGridRequest.java
@@ -21,4 +21,6 @@ public class DatasetTaskGridRequest extends KeywordRequest {
     private String id;
 
     private Long userId;
+
+    private String datasetId;
 }
diff --git a/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.java
index 64e1b4170f..5b6c51d920 100644
--- a/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.java
+++ b/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.java
@@ -23,6 +23,8 @@ public interface ExtDataSetTaskMapper {
 
     List<DataSetTaskDTO> userTaskList(DatasetTaskGridRequest request);
 
+    String datasetPrivileges(DatasetTaskGridRequest request);
+
     List<DataSetTaskDTO> taskWithTriggers(DatasetTaskGridRequest request);
 
     List<DataSetTaskDTO> findByPanelId(@Param("panelId") String panelId);
diff --git a/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml
index 57090a03ad..d8b9149d79 100644
--- a/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml
+++ b/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml
@@ -136,9 +136,12 @@
 
     </select>
 
+    <select id="datasetPrivileges" resultType="String" parameterType="io.dataease.controller.dataset.request.DatasetTaskGridRequest">
+        SELECT get_auths(#{datasetId}, 'dataset', #{userId})
+    </select>
+
     <select id="userTaskList" resultMap="TaskResult" parameterType="io.dataease.controller.dataset.request.DatasetTaskGridRequest">
-        SELECT dataset_table.name as table_name, get_auths(dataset_table_task.table_id,'dataset', #{userId}) as
-        `privileges`,dataset_table_task.* , qrtz_triggers.NEXT_FIRE_TIME
+        SELECT dataset_table.name as table_name,dataset_table_task.* , qrtz_triggers.NEXT_FIRE_TIME
         FROM 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 and qrtz_triggers.TRIGGER_STATE != 'PAUSED'
diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
index c377b4ddd2..de628bbc73 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
@@ -271,7 +271,12 @@ public class DataSetTableTaskService {
             return extDataSetTaskMapper.taskList(request);
         } else {
             request.setUserId(AuthUtils.getUser().getUserId());
-            return extDataSetTaskMapper.userTaskList(request);
+            List<DataSetTaskDTO> dataSetTaskDTOS = extDataSetTaskMapper.userTaskList(request);
+            dataSetTaskDTOS.forEach(dataSetTaskDTO -> {
+                request.setDatasetId(dataSetTaskDTO.getId());
+                dataSetTaskDTO.setPrivileges(extDataSetTaskMapper.datasetPrivileges(request));
+            });
+            return dataSetTaskDTOS;
         }
     }
 
@@ -312,10 +317,10 @@ public class DataSetTableTaskService {
         record.setStatus(datasetTableTask.getStatus());
         datasetTableTaskMapper.updateByExampleSelective(record, datasetTableTaskExample);
 
-        if(datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Pending.name())){
+        if (datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Pending.name())) {
             scheduleService.pauseTrigger(datasetTableTask);
         }
-        if(datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Underway.name())){
+        if (datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Underway.name())) {
             scheduleService.resumeTrigger(datasetTableTask);
         }
     }