From cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 28 八月 2025 20:14:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
index bda3eb5..e013170 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
@@ -27,6 +27,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
@@ -90,11 +91,12 @@
List<ParticipantVo> filteredParticipants = new ArrayList<>();
for (ParticipantVo participant : participantVos) {
- if (participant.getIdcard() != null && !participant.getIdcard().isEmpty()) {
+// if (participant.getIdcard() != null && !participant.getIdcard().isEmpty()) {
filteredParticipants.add(participant);
- }
+// }
}
- return ResultUtil.success(filteredParticipants);
+ List<ParticipantVo> collect = filteredParticipants.stream().distinct().collect(Collectors.toList());
+ return ResultUtil.success(collect);
// }
// return ResultUtil.success(participantVos);
--
Gitblit v1.7.1