fix: 单位显示"无"时fallback到organization字段
当martial_schedule_participant.organization为空或"无"时, 使用martial_athlete.organization作为fallback Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
This commit is contained in:
@@ -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,
|
||||
|
||||
+1
-1
@@ -225,7 +225,7 @@ public class ScheduleQueryService {
|
||||
for (MartialScheduleParticipant p : participants) {
|
||||
Map<String, Object> 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);
|
||||
|
||||
Reference in New Issue
Block a user