c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
=
2026-04-02 10:03:33 +08:00
parent 8e2b7775c7
commit 12e2cb073b
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java
+1 -2
View File
@@ -306,8 +306,7 @@ public class ActivityApplyController {
Cnd cndTeam = Cnd.NEW(); Cnd cndTeam = Cnd.NEW();
cndTeam.and("eventId", "=", eventId); cndTeam.and("eventId", "=", eventId);
cndTeam.and("activityId", "=", activityId); cndTeam.and("activityId", "=", activityId);
cnd.asc("location"); List<ActivitySchoolTeam> teamList = activitySchoolTeamService.dao().query(ActivitySchoolTeam.class, cndTeam.orderBy("CAST(SUBSTRING(name FROM 2 FOR LOCATE('队', name) - 2) AS UNSIGNED)", "ASC"));
List<ActivitySchoolTeam> teamList = activitySchoolTeamService.query(cndTeam);
if (activity.getApplyMultipleTeamsUnionIds().contains(Vi.getUnionId())) { if (activity.getApplyMultipleTeamsUnionIds().contains(Vi.getUnionId())) {
result.put("team", teamList); result.put("team", teamList);
src/main/resources/views/platform/activity/school/ActivityApply.html
+1 -5
View File
@@ -1981,11 +1981,7 @@ layout("/layouts/platform.html"){
const {users, awardsModeT, awardsModeG, team, activity, getEvent} = resp.data const {users, awardsModeT, awardsModeG, team, activity, getEvent} = resp.data
this.activityData = activity this.activityData = activity
this.eventData = getEvent this.eventData = getEvent
this.teams = team.sort((a, b) => { this.teams = team
const numA = parseInt(a.name.replace('第', '').replace('队', ''))
const numB = parseInt(b.name.replace('第', '').replace('队', ''))
return numA - numB
})
if (this.teams.length) { if (this.teams.length) {
this.team = this.teams[0].id this.team = this.teams[0].id
this.teamId = this.teams[0].id this.teamId = this.teams[0].id