|
@@ -1927,7 +1927,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
List<SysTask> list = iSysTaskService.list(new LambdaQueryWrapper<SysTask>()
|
|
|
.eq(SysTask::getSysUserId, userId)
|
|
|
.eq(SysTask::getStatus, 1)
|
|
|
- .eq(SysTask::getTaskType, 2));
|
|
|
+ .eq(SysTask::getTaskType, 2)
|
|
|
+ .orderByDesc(SysTask::getCreateTime));
|
|
|
if (CollectionUtils.isEmpty(list)){
|
|
|
return new ArrayList<>();
|
|
|
}
|
|
@@ -1938,6 +1939,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
vo.setTaskStatus(item.getTaskStatus());
|
|
|
vo.setCreateSysUserId(item.getSysUserId());
|
|
|
vo.setTaskPath(item.getTaskPath());
|
|
|
+ vo.setTaskTime(item.getCreateTime());
|
|
|
return vo;
|
|
|
}).collect(Collectors.toList());
|
|
|
return collect;
|