diff --git a/src/main/java/goormthon/team28/startup_valley/repository/WorkRepository.java b/src/main/java/goormthon/team28/startup_valley/repository/WorkRepository.java index 59f6094..f874781 100644 --- a/src/main/java/goormthon/team28/startup_valley/repository/WorkRepository.java +++ b/src/main/java/goormthon/team28/startup_valley/repository/WorkRepository.java @@ -17,6 +17,7 @@ public interface WorkRepository extends JpaRepository { Optional findByScrumAndOwnerAndEndAtIsNull(Scrum scrum,Member owner); Optional findByIdAndOwner(Long workId, Member owner); List findAllByOwner(Member member); + List findAllByOwnerAndEndAtIsNotNull(Member member); List findTop3ByScrum(Scrum scrum); List findAllByScrum(Scrum scrum); diff --git a/src/main/java/goormthon/team28/startup_valley/service/WorkService.java b/src/main/java/goormthon/team28/startup_valley/service/WorkService.java index 7f8c9f6..ceb479c 100644 --- a/src/main/java/goormthon/team28/startup_valley/service/WorkService.java +++ b/src/main/java/goormthon/team28/startup_valley/service/WorkService.java @@ -128,7 +128,7 @@ public WorkManageListDto listManageWork(Long userId, Long membersId) { if (!team.getLeader().equals(currentMember)) throw new CommonException(ErrorCode.MISMATCH_MEMBER_AND_TEAM_LEADER); - List workList = workRepository.findAllByOwner(targetMember); + List workList = workRepository.findAllByOwnerAndEndAtIsNotNull(targetMember); List workManageDtoList = workList.stream() .map(work -> WorkManageDto.of( work.getId(),