From 4e8c2178bad4540e069e1fd5558095f723ff834b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com> Date: Fri, 17 Jun 2022 09:44:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9C=AA=E5=88=A0=E9=99=A4=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/farm/service/project/ProjectServiceImpl.java | 1 + .../yudao/module/farm/service/task/TaskServiceImpl.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) 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);