项目、任务查看未删除的

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<ProjectDO> 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);

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<PageVO<TaskDetailDTO>> apiGetTaskPage(TaskPageDTO pageDTO){
         PageUtil.startPage(pageDTO);
-        LambdaQueryWrapperX<TaskDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        List<TaskDO> taskDOList = taskMapper.selectList(TaskDO::getPretendDelete, false);
-        List<TaskDO> taskDOList = taskMapper.selectList(lambdaQueryWrapperX);
         List<TaskDetailDTO> taskList = BeanUtil.copyToList(taskDOList, TaskDetailDTO.class);
         PageVO<TaskDetailDTO> pageVO = PageUtil.convertPageInfo(taskList);
         return R.success(pageVO);