From 254b22c969265fd92d61bb8bde4fca96930880bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= Date: Thu, 15 Jan 2026 17:30:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91=20-=20?= =?UTF-8?q?=E5=8F=AA=E6=A3=80=E6=9F=A5registration=5Fstatus=3D1=E7=9A=84?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E8=B7=B3=E8=BF=87=E8=80=8C=E9=9D=9E?= =?UTF-8?q?=E6=8B=92=E7=BB=9D=E9=87=8D=E5=A4=8D=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MartialRegistrationOrderController.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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();