center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 普通用户查询定时任务错误

Browse Source
This commit is contained in:
fit2cloud-chenyw 2023-09-12 12:56:47 +08:00
parent f0b0771aea
commit 60688f9040
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/backend/src/main/java/io/dataease/controller/dataset/request/DatasetTaskGridRequest.java
View File

@ -19,4 +19,6 @@ public class DatasetTaskGridRequest extends KeywordRequest {
private Long[] lastExecTime;
private String id;
private Long userId;
}

4
core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml
View File

@ -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

9
core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
View File

@ -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}")

4
core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
View File

@ -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);
}