diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MiniAuthServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MiniAuthServiceImpl.java index e2329b0..1cec09d 100644 --- a/src/main/java/org/springblade/modules/martial/service/impl/MiniAuthServiceImpl.java +++ b/src/main/java/org/springblade/modules/martial/service/impl/MiniAuthServiceImpl.java @@ -147,14 +147,34 @@ public class MiniAuthServiceImpl implements IMiniAuthService { } private List getAllProjectsByCompetition(Long competitionId) { - return new ArrayList<>(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(MartialProject::getCompetitionId, competitionId); + query.eq(MartialProject::getIsDeleted, 0); + query.orderByAsc(MartialProject::getSortOrder); + return convertToProjectInfoList(projectService.list(query)); } private List parseProjects(String projectsJson) { + // TODO: parse JSON if needed in future return new ArrayList<>(); } private List getProjectsByVenue(Long venueId) { - return new ArrayList<>(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(MartialProject::getVenueId, venueId); + query.eq(MartialProject::getIsDeleted, 0); + query.orderByAsc(MartialProject::getSortOrder); + return convertToProjectInfoList(projectService.list(query)); + } + + private List convertToProjectInfoList(List projects) { + List result = new ArrayList<>(); + for (MartialProject p : projects) { + MiniLoginVO.ProjectInfo info = new MiniLoginVO.ProjectInfo(); + info.setProjectId(p.getId()); + info.setProjectName(p.getProjectName()); + result.add(info); + } + return result; } }