Merge remote-tracking branch 'origin/feature_教代会代表证' into release_20260831

2026-08-31 13:36:12 +08:00
parent 5f20d703e4 f6834bb969
commit 120f0bd046
6 changed files with 615 additions and 418 deletions
@@ -128,6 +128,27 @@ public class GuildHallMeetingController {
 		return Result.success(results);
 	}

+    @At
+    @SaCheckPermission("h5.guildHall.metting")
+    @ApiOperation("H5会议详情")
+    public Result selectDetail(String meetingId) {
+        if (StrUtil.isBlank(meetingId)) {
+            return Result.error("缺少会议参数");
+        }
+        GuildHallMeeting meeting = dao.fetch(GuildHallMeeting.class, meetingId);
+        if (meeting == null || DateUtil.compare(DateUtil.date(), meeting.getEndTime()) > 0) {
+            return Result.error("会议不存在或已结束");
+        }
+        if (meeting.getGroupId() != null
+                && !activityBasicScopeService.isUserInGroup(meeting.getGroupId(), SecurityUtil.getUserId())) {
+            return Result.error("无权查看该会议");
+        }
+        NutMap meetingMap = Lang.obj2nutmap(meeting);
+        GuildHall hall = dao.fetch(GuildHall.class, meeting.getHallId());
+        meetingMap.put("address", hall == null ? null : hall.getAddress());
+        return Result.success(meetingMap);
+    }
+
    @At
    @SaCheckPermission("h5.guildHall.metting")
    @ApiOperation("H5进行中会议分页")