fix the exit bug

Dapp-Learning-DAO · Dec 17, 2023 · 3027038 · 3027038
1 parent 35e2d55
commit 3027038
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/dl/officialsite/team/TeamService.java b/src/main/java/com/dl/officialsite/team/TeamService.java
@@ -223,10 +223,10 @@ public void approve(TeamMemberApproveVO teamMemberApproveVO) {
 
     public void exit(TeamMemberJoinVO teamMember, String address) {
 
-       Optional<Member> member =  memberRepository.findByAddress(address);
+       Optional<Member> member =  memberRepository.findById(teamMember.getMemberId());
        if(member.isPresent() ) {
           // only self or admin
-           if (checkMemberIsAdmin(address) || member.get().getId().equals(teamMember.getMemberId())) {
+           if (checkMemberIsAdmin(address)  ||  member.get().getAddress().equals(address)) {
                teamMemberRepository.findByTeamAndMember(teamMember.getTeamId(),
                        teamMember.getMemberId()).ifPresent(teamMember1 -> {
                    teamMember1.setStatus(Constants.EXIT_TEAM);