diff --git a/src/main/java/org/springblade/modules/martial/controller/MartialRegistrationOrderController.java b/src/main/java/org/springblade/modules/martial/controller/MartialRegistrationOrderController.java index 49b5ce2..51868bc 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialRegistrationOrderController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialRegistrationOrderController.java @@ -334,12 +334,13 @@ public class MartialRegistrationOrderController extends BladeController { teamCheckWrapper.eq(MartialAthlete::getCompetitionId, dto.getCompetitionId()) .eq(MartialAthlete::getProjectId, projectId) .eq(MartialAthlete::getTeamName, team.getTeamName()) - .eq(MartialAthlete::getIsDeleted, 0); + .eq(MartialAthlete::getIsDeleted, 0) + .eq(MartialAthlete::getRegistrationStatus, 1); MartialAthlete existingTeamRecord = athleteService.getOne(teamCheckWrapper, false); if (existingTeamRecord != null) { - log.warn("集体重复报名: teamName={}, projectId={}", team.getTeamName(), projectId); - return R.fail("集体 " + team.getTeamName() + " 已报名该项目,请勿重复报名"); + log.warn("集体重复报名,已跳过: teamName={}, projectId={}", team.getTeamName(), projectId); + continue; } MartialAthlete teamAthlete = new MartialAthlete(); @@ -377,13 +378,14 @@ public class MartialRegistrationOrderController extends BladeController { checkWrapper.eq(MartialAthlete::getCompetitionId, dto.getCompetitionId()) .eq(MartialAthlete::getProjectId, projectId) .eq(MartialAthlete::getIdCard, existingAthlete.getIdCard()) - .eq(MartialAthlete::getIsDeleted, 0); + .eq(MartialAthlete::getIsDeleted, 0) + .eq(MartialAthlete::getRegistrationStatus, 1); MartialAthlete existingRecord = athleteService.getOne(checkWrapper, false); if (existingRecord != null) { - // Reject duplicate registration - log.warn("选手重复报名: playerName={}, projectId={}", existingAthlete.getPlayerName(), projectId); - return R.fail("选手 " + existingAthlete.getPlayerName() + " 已报名该项目,请勿重复报名"); + // Skip duplicate registration + log.warn("选手重复报名,已跳过: playerName={}, projectId={}", existingAthlete.getPlayerName(), projectId); + continue; } else { // Create new record MartialAthlete newRecord = new MartialAthlete();