|
|
|
@ -58,7 +58,7 @@ public class SupTaskService extends ServiceImpl<SupTaskMapper, SupTask> { |
|
|
|
|
|
|
|
|
|
|
|
public Page<TaskVo> pageTaskData(TaskQueryParam queryParam){ |
|
|
|
public Page<TaskVo> pageTaskData(TaskQueryParam queryParam){ |
|
|
|
UserAuth user = UserContextHolder.getCurrentUser(); |
|
|
|
UserAuth user = UserContextHolder.getCurrentUser(); |
|
|
|
if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) || !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) { |
|
|
|
if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) { |
|
|
|
return new Page<TaskVo>().setTotal(0).setRecords(new ArrayList<>()); |
|
|
|
return new Page<TaskVo>().setTotal(0).setRecords(new ArrayList<>()); |
|
|
|
} |
|
|
|
} |
|
|
|
QueryWrapper<SupTask> queryWrapper = new QueryWrapper<>(); |
|
|
|
QueryWrapper<SupTask> queryWrapper = new QueryWrapper<>(); |
|
|
|
@ -67,7 +67,7 @@ public class SupTaskService extends ServiceImpl<SupTaskMapper, SupTask> { |
|
|
|
.eq(StrUtil.isNotEmpty(queryParam.getTaskType()),"t.task_type", queryParam.getTaskType()) |
|
|
|
.eq(StrUtil.isNotEmpty(queryParam.getTaskType()),"t.task_type", queryParam.getTaskType()) |
|
|
|
.groupBy("t.id") |
|
|
|
.groupBy("t.id") |
|
|
|
.orderByDesc("t.create_time"); |
|
|
|
.orderByDesc("t.create_time"); |
|
|
|
Page<TaskVo> page= baseMapper.queryTaskList(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); |
|
|
|
Page<TaskVo> page = baseMapper.queryTaskList(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); |
|
|
|
page.getRecords().forEach(s->{ |
|
|
|
page.getRecords().forEach(s->{ |
|
|
|
List<SupTaskPerson> problems =personService.list(new LambdaQueryWrapper<SupTaskPerson>().eq(SupTaskPerson::getTaskId,s.getId())); |
|
|
|
List<SupTaskPerson> problems =personService.list(new LambdaQueryWrapper<SupTaskPerson>().eq(SupTaskPerson::getTaskId,s.getId())); |
|
|
|
if(CollectionUtil.isNotEmpty(problems)){ |
|
|
|
if(CollectionUtil.isNotEmpty(problems)){ |
|
|
|
|