diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java index d1df724..2c71306 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java @@ -128,8 +128,10 @@ public class TaskController extends JeecgController { 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 pageList = taskService.page(page, queryWrapper);