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);