diff --git a/src/main/java/com/project/task/domain/service/impl/CandidateSearchTaskDomainServiceImpl.java b/src/main/java/com/project/task/domain/service/impl/CandidateSearchTaskDomainServiceImpl.java index 5c69534..3701935 100644 --- a/src/main/java/com/project/task/domain/service/impl/CandidateSearchTaskDomainServiceImpl.java +++ b/src/main/java/com/project/task/domain/service/impl/CandidateSearchTaskDomainServiceImpl.java @@ -75,14 +75,14 @@ public class CandidateSearchTaskDomainServiceImpl implements CandidateSearchTask queryWrapper.le(TaskEntity::getStartTime, endOfToday); queryWrapper.ge(TaskEntity::getEndTime, beginOfToday); queryWrapper.inSql(TaskEntity::getId, - String.format("SELECT task_id FROM evaluator_task_user WHERE user_id = '%s' AND status = %s", SecurityUtils.getUserId() , TaskUserStatusEnum.Not_Start.getValue())); + String.format("SELECT task_id FROM evaluator_task_user WHERE user_id = '%s' AND status = %s and deleted = 0 ", SecurityUtils.getUserId() , TaskUserStatusEnum.Not_Start.getValue())); } // 已考试:在有效期内,用户状态为已通过或未通过 if (StrUtil.equals(param.getCandidateTaskStatus() , CandidateTaskStatusEnum.Has_Exam.name())) { queryWrapper.le(TaskEntity::getStartTime, endOfToday); queryWrapper.ge(TaskEntity::getEndTime, beginOfToday); queryWrapper.inSql(TaskEntity::getId, - String.format("SELECT task_id FROM evaluator_task_user WHERE user_id = '%s' AND status in (%s)", + String.format("SELECT task_id FROM evaluator_task_user WHERE user_id = '%s' AND status in (%s) and deleted = 0 ", SecurityUtils.getUserId() , CollUtil.join(List.of(TaskUserStatusEnum.Fail.getValue() , TaskUserStatusEnum.Pass.getValue()) , ","))); }