From 4ca5d9387702131e67c0a06f19e1bf092ea966d7 Mon Sep 17 00:00:00 2001
From: Z-WICK <2289431216@qq.com>
Date: Mon, 26 Jan 2026 12:32:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E5=BA=A6=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=89=80=E6=9C=89=E5=8F=82=E8=B5=9B=E9=80=89?=
 =?UTF-8?q?=E6=89=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

撤销之前的集体项目分组逻辑，所有项目都显示全部参赛者

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
---
 .../impl/MartialScheduleServiceImpl.java      | 50 +++++--------------
 1 file changed, 13 insertions(+), 37 deletions(-)

diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java
index 2805a11..a06ceb0 100644
--- a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java
@@ -841,43 +841,19 @@ public class MartialScheduleServiceImpl extends ServiceImpl<MartialScheduleMappe
 
 			List<org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant> participantVOs;
 
-			// 集体项目(projectType=2)按organization分组，只返回一条记录代表整个队伍
-			if (group.getProjectType() != null && group.getProjectType() == 2) {
-				// 按organization分组，取每组第一个作为代表
-				java.util.Map<String, MartialScheduleParticipant> orgMap = new java.util.LinkedHashMap<>();
-				for (MartialScheduleParticipant p : participants) {
-					String org = p.getOrganization() != null ? p.getOrganization() : "未知单位";
-					if (!orgMap.containsKey(org)) {
-						orgMap.put(org, p);
-					}
-				}
-				participantVOs = orgMap.values().stream().map(p -> {
-					org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant pVO =
-						new org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant();
-					pVO.setId(p.getId());
-					pVO.setParticipantId(p.getParticipantId());
-					pVO.setOrganization(p.getOrganization());
-					pVO.setPlayerName(p.getOrganization()); // 集体项目显示单位名称
-					pVO.setProjectName(p.getProjectName());
-					pVO.setCategory(p.getCategory());
-					pVO.setPerformanceOrder(p.getPerformanceOrder());
-					return pVO;
-				}).collect(Collectors.toList());
-			} else {
-				// 单人项目，正常返回所有参赛者
-				participantVOs = participants.stream().map(p -> {
-					org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant pVO =
-						new org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant();
-					pVO.setId(p.getId());
-					pVO.setParticipantId(p.getParticipantId());
-					pVO.setOrganization(p.getOrganization());
-					pVO.setPlayerName(p.getPlayerName());
-					pVO.setProjectName(p.getProjectName());
-					pVO.setCategory(p.getCategory());
-					pVO.setPerformanceOrder(p.getPerformanceOrder());
-					return pVO;
-				}).collect(Collectors.toList());
-			}
+			// 所有项目都返回全部参赛者
+			participantVOs = participants.stream().map(p -> {
+				org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant pVO =
+					new org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant();
+				pVO.setId(p.getId());
+				pVO.setParticipantId(p.getParticipantId());
+				pVO.setOrganization(p.getOrganization());
+				pVO.setPlayerName(p.getPlayerName());
+				pVO.setProjectName(p.getProjectName());
+				pVO.setCategory(p.getCategory());
+				pVO.setPerformanceOrder(p.getPerformanceOrder());
+				return pVO;
+			}).collect(Collectors.toList());
 
 			groupVO.setParticipants(participantVOs);
 			groups.add(groupVO);