From 00429b2b27e4643b3cace03870f3dffc5aa8fe48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= Date: Thu, 22 Jan 2026 23:50:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=95=E4=BD=8D=E6=98=BE=E7=A4=BA"?= =?UTF-8?q?=E6=97=A0"=E6=97=B6fallback=E5=88=B0organization=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当martial_schedule_participant.organization为空或"无"时， 使用martial_athlete.organization作为fallback Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com> --- .../modules/martial/mapper/MartialScheduleGroupMapper.xml | 2 +- .../martial/service/schedule/query/ScheduleQueryService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml b/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml index 62a19de..97ab576 100644 --- a/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml +++ b/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml @@ -31,7 +31,7 @@ d.time_slot_index AS timeSlotIndex, d.schedule_date AS scheduleDate, p.participant_id AS participantId, - p.organization AS organization, + CASE WHEN p.organization IS NULL OR p.organization = '' OR p.organization = '无' THEN ma.organization ELSE p.organization END AS organization, p.check_in_status AS checkInStatus, p.schedule_status AS scheduleStatus, p.performance_order AS performanceOrder, diff --git a/src/main/java/org/springblade/modules/martial/service/schedule/query/ScheduleQueryService.java b/src/main/java/org/springblade/modules/martial/service/schedule/query/ScheduleQueryService.java index fb1375a..28989ca 100644 --- a/src/main/java/org/springblade/modules/martial/service/schedule/query/ScheduleQueryService.java +++ b/src/main/java/org/springblade/modules/martial/service/schedule/query/ScheduleQueryService.java @@ -225,7 +225,7 @@ public class ScheduleQueryService { for (MartialScheduleParticipant p : participants) { Map pData = new HashMap<>(); pData.put("id", p.getParticipantId()); - pData.put("organization", p.getOrganization()); + pData.put("schoolUnit", p.getOrganization()); pData.put("playerName", p.getPlayerName()); pData.put("scheduleDetail", loadParticipantScheduleDetail(p.getScheduleDetailId())); result.add(pData);