|
|
|
@ -128,8 +128,10 @@ public class TaskController extends JeecgController<Task, ITaskService> { |
|
|
|
|
if (task != null && task.getWorkStatus() != null && (task.getWorkStatus() == 0 || task.getWorkStatus() == 1)) { |
|
|
|
|
queryWrapper.in("work_status", 0, 1); |
|
|
|
|
} |
|
|
|
|
if (task != null && task.getWorkStatus() != null && (task.getWorkStatus() == 2 || task.getWorkStatus() == 9)) { |
|
|
|
|
else if (task != null && task.getWorkStatus() != null && (task.getWorkStatus() == 2 || task.getWorkStatus() == 9)) { |
|
|
|
|
queryWrapper.in("work_status", 2, 9); |
|
|
|
|
} else if (task != null && task.getWorkStatus() != null){ |
|
|
|
|
queryWrapper.eq("work_status", task.getWorkStatus()); |
|
|
|
|
} |
|
|
|
|
queryWrapper.orderByDesc("update_time"); |
|
|
|
|
IPage<Task> pageList = taskService.page(page, queryWrapper); |
|
|
|
|