diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index 1146bf7..1b6dce6 100644 Binary files a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta and b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta index 0fd6f34..40c0aa0 100644 Binary files a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta index d0ef0c3..2df44b9 100644 Binary files a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta index 4287c32..0cfff96 100644 Binary files a/minio_data/.minio.sys/buckets/.usage.json/xl.meta and b/minio_data/.minio.sys/buckets/.usage.json/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta index da1016b..d271bec 100644 Binary files a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta index 4c1f1e3..2cf869c 100644 Binary files a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/assets/.metadata.bin/xl.meta b/minio_data/.minio.sys/buckets/assets/.metadata.bin/xl.meta index 1e68eb7..982d557 100644 Binary files a/minio_data/.minio.sys/buckets/assets/.metadata.bin/xl.meta and b/minio_data/.minio.sys/buckets/assets/.metadata.bin/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta index f9eadf5..9d9cd3c 100644 Binary files a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta index 56ca133..ccec70b 100644 Binary files a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta differ diff --git a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java index 4e6f5cd..33d7747 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java @@ -114,16 +114,23 @@ public class MartialMiniController extends BladeController { martialVenue = venueService.getById(invite.getVenueId()); } - // 获取项目列表:如果邀请记录中有指定项目则使用,否则根据场地获取项目 + // 获取项目列表:总裁判看所有项目,其他裁判根据场地获取项目 List projects; - if (Func.isNotEmpty(invite.getProjects())) { + Integer refereeTypeVal = invite.getRefereeType(); + String roleVal = invite.getRole(); + boolean isGeneralJudge = (refereeTypeVal != null && refereeTypeVal == 3) + || "general_judge".equals(roleVal) || "general".equals(roleVal); + + if (isGeneralJudge) { + // 总裁判看所有项目 + projects = getAllProjectsByCompetition(competition.getId()); + } else if (Func.isNotEmpty(invite.getProjects())) { projects = parseProjects(invite.getProjects()); } else { // 未指定项目,根据场地获取项目;如果没有场地则获取所有项目 if (invite.getVenueId() != null) { projects = getProjectsByVenue(invite.getVenueId()); } else { - // 总裁或未分配场地的裁判,获取所有项目 projects = getAllProjectsByCompetition(competition.getId()); } } @@ -522,16 +529,23 @@ public class MartialMiniController extends BladeController { MartialCompetition competition = competitionService.getById(invite.getCompetitionId()); MartialJudge judge = judgeService.getById(invite.getJudgeId()); MartialVenue martialVenue = invite.getVenueId() != null ? venueService.getById(invite.getVenueId()) : null; - // 获取项目列表:如果邀请记录中有指定项目则使用,否则根据场地获取项目 + // 获取项目列表:总裁判看所有项目,其他裁判根据场地获取项目 List projects; - if (Func.isNotEmpty(invite.getProjects())) { + Integer refereeTypeVal = invite.getRefereeType(); + String roleVal = invite.getRole(); + boolean isGeneralJudge = (refereeTypeVal != null && refereeTypeVal == 3) + || "general_judge".equals(roleVal) || "general".equals(roleVal); + + if (isGeneralJudge) { + // 总裁判看所有项目 + projects = getAllProjectsByCompetition(competition.getId()); + } else if (Func.isNotEmpty(invite.getProjects())) { projects = parseProjects(invite.getProjects()); } else { // 未指定项目,根据场地获取项目;如果没有场地则获取所有项目 if (invite.getVenueId() != null) { projects = getProjectsByVenue(invite.getVenueId()); } else { - // 总裁或未分配场地的裁判,获取所有项目 projects = getAllProjectsByCompetition(competition.getId()); } }