From 55163b9fec9a82473734be4e50d6d51d6572a2c0 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Mon, 26 Oct 2026 15:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E8=82=B2=E6=B4=BB=E5=8A=A8=E6=88=90?= =?UTF-8?q?=E7=BB=A9=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActivitySportsResultsController.java | 3 ++- .../service/impl/ActivitySportsServiceImpl.java | 11 +++++------ .../zhgh/activity/sports/ActivityResults/index.html | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsResultsController.java b/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsResultsController.java index edce0183..114ecef9 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsResultsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsResultsController.java @@ -134,7 +134,8 @@ public class ActivitySportsResultsController { activitySchoolApply.setActivityUnionName(basicUnion.getName()); activitySchoolApplyViService.insert(activitySchoolApply); }); - return null; + // 与下方已有人员分支一致返回 Result，避免前端拿到 null 导致回调中断。 + return Result.success(); } sysUser.setSex(activitySchoolApply.getSex()); baseService.update(sysUser); diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsServiceImpl.java index 796a9169..93f39508 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsServiceImpl.java @@ -339,17 +339,16 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl i WHERE app.activityId = @id and app.status = 2 - $cnd + and (@unionId is null or app.activityUnionId = @unionId) ORDER BY ev.allName DESC, u.unionname DESC, app.`team` asc """).setParam("id", id) - .setVar("cnd", ""); - if (Strings.isNotBlank(unionId)) { - sql.setVar("cnd", "and u.unionid = @unionId"); - sql.setParam("unionId", unionId); - } + // Nutz 只在主 SQL 文本里解析 @param，$var 内容中的 @unionId 不会被替换（日志中可见残留为字面量，导致查询恒为空）， + // 因此条件必须写在主 SQL 中；unionId 为空时置 null 表示导出全部分工会。 + // 注意按报名记录上的活动工会（activityUnionId）过滤，不能用 vw_user.unionid（系统工会 ID 空间，人员换单位后两套 ID 会不一致）。 + .setParam("unionId", Strings.isBlank(unionId) ? null : unionId); List list = list(sql); String activityName; if (Lang.isNotEmpty(list)) { diff --git a/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html b/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html index fbcc2121..775f9fcb 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html +++ b/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html @@ -620,6 +620,8 @@ layout("/layouts/platform.html"){ this.userDetailsChange() } this.dialogVisible = false + // 补成功提示：此前两条后端分支均无通知，用户无法确认是否添加成功。 + this.notifySuccess(resp.msg) } else { this.notifyWarning(resp.msg) }