Skip to content

Commit

Permalink
fix: edit approve function
Browse files Browse the repository at this point in the history
  • Loading branch information
cheng521521 committed Nov 3, 2023
1 parent bea4a9a commit e061db9
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions src/main/java/com/dl/officialsite/team/TeamService.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package com.dl.officialsite.team;

import static org.bouncycastle.asn1.x500.style.RFC4519Style.member;

import com.dl.officialsite.common.constants.Constants;
import com.dl.officialsite.common.enums.CodeEnums;
import com.dl.officialsite.common.exception.BizException;
import com.dl.officialsite.mail.EmailService;
import com.dl.officialsite.member.Member;
import com.dl.officialsite.member.MemberRepository;
import com.dl.officialsite.redpacket.RedPacket;
import com.dl.officialsite.team.vo.TeamMemberApproveVO;
import com.dl.officialsite.team.vo.TeamMemberJoinVO;
import com.dl.officialsite.team.vo.TeamQueryVo;
Expand Down Expand Up @@ -79,7 +77,8 @@ public javax.persistence.criteria.Predicate toPredicate(
TeamsMembersVo teamsMembersVo = new TeamsMembersVo();
BeanUtils.copyProperties(team, teamsMembersVo);
List<Member> members = new ArrayList<>();
List<Long> memberIds = teamMemberRepository.findByTeamIdStatus(team.getId(), teamQueryVo.getStatus());
List<Long> memberIds = teamMemberRepository.findByTeamIdStatus(team.getId(),
teamQueryVo.getStatus());
memberIds.stream().forEach(memberId -> {
Member member = memberRepository.findById(memberId).get();
members.add(member);
Expand Down Expand Up @@ -128,7 +127,7 @@ public void approve(TeamMemberApproveVO teamMemberApproveVO) {
}
});
teamMemberRepository.saveAll(teamMembers);
/* //发送邮件
//发送邮件
Team team = teamRepository.findById(teamMemberApproveVO.getTeamId()).get();
String administratorAddress = team.getAdministrator();
if (!ObjectUtils.isEmpty(administratorAddress) || !"".equals(administratorAddress)) {
Expand All @@ -148,11 +147,10 @@ public void approve(TeamMemberApproveVO teamMemberApproveVO) {
} else {
throw new BizException(CodeEnums.TEAM_ADMIN_NOT_EXIST.getCode(),
CodeEnums.TEAM_ADMIN_NOT_EXIST.getMsg());
}*/
}
}



public void exit(TeamMemberJoinVO teamMember) {
TeamMember teamMember1 = new TeamMember();
BeanUtils.copyProperties(teamMember, teamMember1);
Expand Down Expand Up @@ -212,7 +210,7 @@ public TeamsMembersVo getTeamById(Long teamId) {
BeanUtils.copyProperties(team, teamsMembersVo);
return teamsMembersVo;
} else {
throw new BizException(CodeEnums.TEAM_NOT_EXIST.getCode(),
throw new BizException(CodeEnums.TEAM_NOT_EXIST.getCode(),
CodeEnums.TEAM_NOT_EXIST.getMsg());
}
}
Expand Down

0 comments on commit e061db9

Please sign in to comment.