体育活动成绩整改
This commit is contained in:
+2
-1
@@ -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);
|
||||
|
||||
+5
-6
@@ -339,17 +339,16 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> 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<Record> list = list(sql);
|
||||
String activityName;
|
||||
if (Lang.isNotEmpty(list)) {
|
||||
|
||||
@@ -620,6 +620,8 @@ layout("/layouts/platform.html"){
|
||||
this.userDetailsChange()
|
||||
}
|
||||
this.dialogVisible = false
|
||||
// 补成功提示:此前两条后端分支均无通知,用户无法确认是否添加成功。
|
||||
this.notifySuccess(resp.msg)
|
||||
} else {
|
||||
this.notifyWarning(resp.msg)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user