Merge pull request #88 from yanyanho/main

fix the bug
Dapp-Learning-DAO · Dec 13, 2023 · 60e5b5f · 60e5b5f
2 parents 4eccf33 + 72b0a88
commit 60e5b5f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/dl/officialsite/member/MemberService.java b/src/main/java/com/dl/officialsite/member/MemberService.java
@@ -39,7 +39,7 @@ public MemberWithTeam getMemberWithTeamInfoByAddress(String address) {
         if(member.isPresent()) {
             MemberWithTeam memberWithTeam = new MemberWithTeam();
             BeanUtils.copyProperties(member, memberWithTeam);
-             ArrayList teams = memberWithTeam.getTeams();
+             ArrayList teams = new ArrayList();
             List<TeamMember> teamMembers = teamMemberRepository.findByMemberId(member.get().getId());
 
             teamMembers.stream().forEach(teamMember -> {
@@ -49,6 +49,7 @@ public MemberWithTeam getMemberWithTeamInfoByAddress(String address) {
                 }
                 teams.add(team);
             });
+            memberWithTeam.setTeams(teams);
             return memberWithTeam;
         }
         return null;