diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index 1b6dce6..67142a2 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 40c0aa0..55691e0 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 2df44b9..9a531fb 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 0cfff96..c3f10bc 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 d271bec..6e291d4 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 2cf869c..4dd78ad 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 982d557..25beed0 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 9d9cd3c..f63379b 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 ccec70b..7396a1a 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 33d7747..a87bc25 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java @@ -115,7 +115,7 @@ public class MartialMiniController extends BladeController { } // 获取项目列表:总裁判看所有项目,其他裁判根据场地获取项目 - List projects; + List projects = new ArrayList<>(); Integer refereeTypeVal = invite.getRefereeType(); String roleVal = invite.getRole(); boolean isGeneralJudge = (refereeTypeVal != null && refereeTypeVal == 3) @@ -126,14 +126,11 @@ public class MartialMiniController extends BladeController { 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()); - } + } else if (invite.getVenueId() != null) { + // 未指定项目,根据场地获取项目;如果场地没有项目则返回空列表 + projects = getProjectsByVenue(invite.getVenueId()); } + // 如果没有场地,projects保持为空列表 MiniLoginVO vo = new MiniLoginVO(); vo.setToken(token); @@ -530,7 +527,7 @@ public class MartialMiniController extends BladeController { MartialJudge judge = judgeService.getById(invite.getJudgeId()); MartialVenue martialVenue = invite.getVenueId() != null ? venueService.getById(invite.getVenueId()) : null; // 获取项目列表:总裁判看所有项目,其他裁判根据场地获取项目 - List projects; + List projects = new ArrayList<>(); Integer refereeTypeVal = invite.getRefereeType(); String roleVal = invite.getRole(); boolean isGeneralJudge = (refereeTypeVal != null && refereeTypeVal == 3) @@ -541,14 +538,11 @@ public class MartialMiniController extends BladeController { 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()); - } + } else if (invite.getVenueId() != null) { + // 未指定项目,根据场地获取项目;如果场地没有项目则返回空列表 + projects = getProjectsByVenue(invite.getVenueId()); } + // 如果没有场地,projects保持为空列表 MiniLoginVO vo = new MiniLoginVO(); vo.setToken(token);