From e061db9f5f20bd6ef61dc548026d6d893d13748b Mon Sep 17 00:00:00 2001 From: chengpengxiang <15503679582@163.com> Date: Fri, 3 Nov 2023 18:02:05 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20edit=20approve=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dl/officialsite/team/TeamService.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/dl/officialsite/team/TeamService.java b/src/main/java/com/dl/officialsite/team/TeamService.java index 3e8c190f..7f86f3f6 100644 --- a/src/main/java/com/dl/officialsite/team/TeamService.java +++ b/src/main/java/com/dl/officialsite/team/TeamService.java @@ -1,6 +1,5 @@ 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; @@ -8,7 +7,6 @@ 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; @@ -79,7 +77,8 @@ public javax.persistence.criteria.Predicate toPredicate( TeamsMembersVo teamsMembersVo = new TeamsMembersVo(); BeanUtils.copyProperties(team, teamsMembersVo); List members = new ArrayList<>(); - List memberIds = teamMemberRepository.findByTeamIdStatus(team.getId(), teamQueryVo.getStatus()); + List memberIds = teamMemberRepository.findByTeamIdStatus(team.getId(), + teamQueryVo.getStatus()); memberIds.stream().forEach(memberId -> { Member member = memberRepository.findById(memberId).get(); members.add(member); @@ -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)) { @@ -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); @@ -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()); } }