commit

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

@@ -302,7 +302,18 @@ public class ActivityApplyController {
         result.put("awardsModeT", awardsModeT);
         result.put("awardsModeG", awardsModeG);
 
-        result.put("team", activitySchoolTeamService.query(Cnd.where("eventId", "=", eventId).and("activityId", "=", activityId).asc("location")));
+        Cnd cndTeam = Cnd.NEW();
+        cndTeam.and("eventId", "=", eventId);
+        cndTeam.and("activityId", "=", activityId);
+        cnd.asc("location");
+        List<ActivitySchoolTeam> teamList = activitySchoolTeamService.query(cndTeam);
+
+        if (activity.getApplyMultipleTeamsUnionIds().contains(Vi.getUnionId())) {
+            result.put("team", teamList);
+        } else {
+            result.put("team", Lang.isNotEmpty(teamList) ? List.of(teamList.get(0)) : teamList);
+        }
+
 
         result.put("activity", activity);
         List<NutMap> events = (List<NutMap>) getEvents(activityId);
@@ -557,15 +568,15 @@ public class ActivityApplyController {
     public Object findUserOne(String id) {
         try {
             Sql sql = Sqls.create("SELECT\n" +
-                    "\tu.id,u.username,u.unitid,\n" +
-                    "\tu.loginname,\n" +
-                    "\tu.sex,\n" +
-                    "\tu.mobile,\n" +
-                    "\tu.position,\n" +
-                    "\tun.`name` unitname \n" +
-                    "FROM\n" +
-                    "\tsys_user u\n" +
-                    "\tLEFT JOIN sys_unit un ON u.unitid = un.id Where u.id = @id").setParam("id", id);
+                                  "\tu.id,u.username,u.unitid,\n" +
+                                  "\tu.loginname,\n" +
+                                  "\tu.sex,\n" +
+                                  "\tu.mobile,\n" +
+                                  "\tu.position,\n" +
+                                  "\tun.`name` unitname \n" +
+                                  "FROM\n" +
+                                  "\tsys_user u\n" +
+                                  "\tLEFT JOIN sys_unit un ON u.unitid = un.id Where u.id = @id").setParam("id", id);
 
             return Result.success().addData(activitySchoolService.list(sql).get(0));
         } catch (Exception e) {
@@ -708,7 +719,7 @@ public class ActivityApplyController {
                                     @Param(value = "CoachData", required = false) ActivitySchoolApply CoachData,
                                     @Param(value = "headData", required = false) ActivitySchoolApply headData,
                                     @Param(value = "activityId") String activityId) {
-        ActivityBasicUnit thisBasicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=",ShiroUtil.getUnitId()));
+        ActivityBasicUnit thisBasicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", ShiroUtil.getUnitId()));
         ActivityBasicUnion thisBasicUnion = activitySchoolService.dao().fetch(ActivityBasicUnion.class, Cnd.where("id", "=", thisBasicUnit.getUnionid()));
         Cnd cnd = Cnd.NEW();
         cnd.and("activityId", "=", activityId);

src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchool.java

@@ -206,4 +206,9 @@ public class ActivitySchool extends BaseModel implements Serializable {
     @Default("0")
     @ColDefine(type = ColType.BOOLEAN)
     private Boolean isSign;
+
+    @Column
+    @Comment("可报多队的工会id")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> applyMultipleTeamsUnionIds;
 }