commit

src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java

@@ -306,8 +306,7 @@ public class ActivityApplyController {
         Cnd cndTeam = Cnd.NEW();
         cndTeam.and("eventId", "=", eventId);
         cndTeam.and("activityId", "=", activityId);
-        cnd.asc("location");
-        List<ActivitySchoolTeam> teamList = activitySchoolTeamService.query(cndTeam);
+        List<ActivitySchoolTeam> teamList = activitySchoolTeamService.dao().query(ActivitySchoolTeam.class, cndTeam.orderBy("CAST(SUBSTRING(name FROM 2 FOR LOCATE('队', name) - 2) AS UNSIGNED)", "ASC"));
 
         if (activity.getApplyMultipleTeamsUnionIds().contains(Vi.getUnionId())) {
             result.put("team", teamList);

src/main/resources/views/platform/activity/school/ActivityApply.html

@@ -1981,11 +1981,7 @@ layout("/layouts/platform.html"){
                     const {users, awardsModeT, awardsModeG, team, activity, getEvent} = resp.data
                     this.activityData = activity
                     this.eventData = getEvent
-                    this.teams = team.sort((a, b) => {
-                        const numA = parseInt(a.name.replace('第', '').replace('队', ''))
-                        const numB = parseInt(b.name.replace('第', '').replace('队', ''))
-                        return numA - numB
-                    })
+                    this.teams = team
                     if (this.teams.length) {
                         this.team = this.teams[0].id
                         this.teamId = this.teams[0].id