diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java index 85099abc..6212bd9a 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java @@ -148,6 +148,7 @@ public class ProjectServiceImpl implements ProjectService { LambdaQueryWrapperX queryWrapperX = new LambdaQueryWrapperX<>(); queryWrapperX.eqIfPresent(ProjectDO::getState, pageDTO.getState()); queryWrapperX.likeIfPresent(ProjectDO::getName, pageDTO.getProjectName()); + queryWrapperX.eq(ProjectDO::getPretendDelete, false); if (ObjectUtil.isNotEmpty(pageDTO.getTimeLimit())){ LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime startTime = pageDTO.getTimeLimit() == 2 ? nowTime.minusDays(3) : nowTime.minusDays(14); diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskServiceImpl.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskServiceImpl.java index 17416763..ddf2c850 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskServiceImpl.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskServiceImpl.java @@ -192,8 +192,7 @@ public class TaskServiceImpl implements TaskService { public R> apiGetTaskPage(TaskPageDTO pageDTO){ PageUtil.startPage(pageDTO); - LambdaQueryWrapperX lambdaQueryWrapperX = new LambdaQueryWrapperX<>(); - List taskDOList = taskMapper.selectList(lambdaQueryWrapperX); + List taskDOList = taskMapper.selectList(TaskDO::getPretendDelete, false); List taskList = BeanUtil.copyToList(taskDOList, TaskDetailDTO.class); PageVO pageVO = PageUtil.convertPageInfo(taskList); return R.success(pageVO);