martial/martial-master
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 单位显示"无"时fallback到organization字段

Browse Source 
当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:
hongjianli
2026-01-22 23:50:59 +08:00
co-authored by factory-droid[bot]
parent e8bc524f61
commit 00429b2b27
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml
+1 -1
View File
@@ -31,7 +31,7 @@
d.time_slot_index AS timeSlotIndex, d.time_slot_index AS timeSlotIndex,
d.schedule_date AS scheduleDate, d.schedule_date AS scheduleDate,
p.participant_id AS participantId, 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.check_in_status AS checkInStatus,
p.schedule_status AS scheduleStatus, p.schedule_status AS scheduleStatus,
p.performance_order AS performanceOrder, p.performance_order AS performanceOrder,
src/main/java/org/springblade/modules/martial/service/schedule/query/ScheduleQueryService.java
+1 -1
View File
@@ -225,7 +225,7 @@ public class ScheduleQueryService {
for (MartialScheduleParticipant p : participants) { for (MartialScheduleParticipant p : participants) {
Map<String, Object> pData = new HashMap<>(); Map<String, Object> pData = new HashMap<>();
pData.put("id", p.getParticipantId()); pData.put("id", p.getParticipantId());
pData.put("organization", p.getOrganization()); pData.put("schoolUnit", p.getOrganization());
pData.put("playerName", p.getPlayerName()); pData.put("playerName", p.getPlayerName());
pData.put("scheduleDetail", loadParticipantScheduleDetail(p.getScheduleDetailId())); pData.put("scheduleDetail", loadParticipantScheduleDetail(p.getScheduleDetailId()));
result.add(pData); result.add(pData);