From 60688f90405105599390ad392f5082928d6f009b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 12 Sep 2023 12:56:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/request/DatasetTaskGridRequest.java          | 2 ++
 .../main/java/io/dataease/ext/ExtDataSetTaskMapper.xml   | 4 ++--
 .../io/dataease/plugins/server/XEmailTaskServer.java     | 9 ++++-----
 .../service/dataset/DataSetTableTaskService.java         | 4 +++-
 4 files changed, 11 insertions(+), 8 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 8f5fe748d6..c3e5654e33 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
@@ -19,4 +19,6 @@ public class DatasetTaskGridRequest extends KeywordRequest {
     private Long[] lastExecTime;
 
     private String id;
+
+    private Long userId;
 }
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 316b283d18..3accb94e70 100644
--- a/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml
+++ b/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml
@@ -126,7 +126,7 @@
     </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', #{extendCondition}) as
+        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
         FROM dataset_table_task
         left join dataset_table on dataset_table.id=dataset_table_task.table_id
@@ -172,7 +172,7 @@
 
 
     <select id="taskWithTriggers" resultMap="TaskResult" parameterType="io.dataease.controller.dataset.request.DatasetTaskGridRequest">
-        SELECT dataset_table.name as table_name, get_auths(dataset_table_task.table_id,'dataset', #{extendCondition}) as
+        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
         FROM dataset_table_task
         left join dataset_table on dataset_table.id=dataset_table_task.table_id
diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
index d25c7d4dac..ee5e5335a7 100644
--- a/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
+++ b/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
@@ -70,6 +70,7 @@ public class XEmailTaskServer {
                 userIdList = new ArrayList<>();
             }
             userIdList.add(user.getUserId());
+            request.setUserIdList(userIdList);
         }
 
         List<XpackTaskGridDTO> tasks = emailXpackService.taskGrid(request);
@@ -95,8 +96,7 @@ public class XEmailTaskServer {
             });
         }
 
-        Pager<List<XpackTaskGridDTO>> listPager = PageUtils.setPageInfo(page, tasks);
-        return listPager;
+        return PageUtils.setPageInfo(page, tasks);
     }
 
     @RequiresPermissions("task-email:edit")
@@ -105,7 +105,7 @@ public class XEmailTaskServer {
         EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
         XpackTaskEntity xpackTaskEntity = emailXpackService.taskDetail(taskId);
         GlobalTaskEntity globalTaskEntity = BeanUtils.copyBean(new GlobalTaskEntity(), xpackTaskEntity);
-        Boolean invalid = false;
+        boolean invalid = false;
         if (CronUtils.taskExpire(globalTaskEntity.getEndTime())) {
             globalTaskEntity.setEndTime(null);
             invalid = true;
@@ -324,8 +324,7 @@ public class XEmailTaskServer {
         EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         List<XpackTaskInstanceDTO> instances = emailXpackService.taskInstanceGrid(request);
-        Pager<List<XpackTaskInstanceDTO>> listPager = PageUtils.setPageInfo(page, instances);
-        return listPager;
+        return PageUtils.setPageInfo(page, instances);
     }
 
     @PostMapping("/execInfo/{instanceId}")
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 54fc3622ab..c1eaddc933 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
@@ -263,15 +263,17 @@ public class DataSetTableTaskService {
     }
 
     public List<DataSetTaskDTO> taskList4User(DatasetTaskGridRequest request) {
-
+        request.setUserId(null);
         if (AuthUtils.getUser().getIsAdmin()) {
             return extDataSetTaskMapper.taskList(request);
         } else {
+            request.setUserId(AuthUtils.getUser().getUserId());
             return extDataSetTaskMapper.userTaskList(request);
         }
     }
 
     public List<DataSetTaskDTO> taskWithTriggers(DatasetTaskGridRequest request) {
+        request.setUserId(AuthUtils.getUser().getUserId());
         return extDataSetTaskMapper.taskWithTriggers(request);
     }