Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix： edit approve function #48

Merged
merged 1 commit into from
Nov 3, 2023
Merged

fix： edit approve function #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/main/java/com/dl/officialsite/team/TeamService.java
View file
Open in desktop
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