From 0cd9ad6b65d4d772e0d88f69072c82f0d0480326 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Fri, 20 Mar 2026 10:19:16 +0800 Subject: [PATCH] commit --- .../io/v/nutz/task/job/staffmanage/UserBirthdayJob.java | 6 +++++- .../birthday/controller/UserBirthdayManageController.java | 4 ++-- .../zhgh/staffmanage/birthday/model/UserBirthdayMsgLog.java | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/v/nutz/task/job/staffmanage/UserBirthdayJob.java b/src/main/java/io/v/nutz/task/job/staffmanage/UserBirthdayJob.java index 9310040..a9b5d84 100644 --- a/src/main/java/io/v/nutz/task/job/staffmanage/UserBirthdayJob.java +++ b/src/main/java/io/v/nutz/task/job/staffmanage/UserBirthdayJob.java @@ -1,7 +1,10 @@ package io.v.nutz.task.job.staffmanage; +import cn.hutool.core.util.ObjectUtil; import io.v.nutz.base.utils.MsgApi; import io.v.nutz.web.commons.base.Globals; +import io.v.nutz.zhgh.staffmanage.birthday.model.UserBirthdayConfig; +import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; @@ -50,7 +53,8 @@ public class UserBirthdayJob implements Job { dao.execute(sql); List list = sql.getList(NutMap.class); - String link = Globals.AppDomain + "/platform/staffManage/birthday/manage/h5"; + UserBirthdayConfig config = dao.fetch(UserBirthdayConfig.class, Cnd.NEW().desc("updatedAt")); + String link = Globals.AppDomain + "/platform/staffManage/birthday/manage/h5?id=" + ObjectUtil.defaultIfBlank(config.getBirthdayUrl(), ""); List loginNameList = list.stream().map(v -> v.getString("loginname")).toList(); diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/birthday/controller/UserBirthdayManageController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/birthday/controller/UserBirthdayManageController.java index 338d8fc..d4753d9 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/birthday/controller/UserBirthdayManageController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/birthday/controller/UserBirthdayManageController.java @@ -59,7 +59,7 @@ public class UserBirthdayManageController { @Ok("beetl:/mobile/staffmanage/birthday/index.html") @RequiresAuthentication public void h5(String id, HttpServletRequest request) { - request.setAttribute("fileId", id); + request.setAttribute("fileId", ObjectUtil.defaultIfBlank(id, "")); } @At @@ -94,7 +94,7 @@ public class UserBirthdayManageController { UserBirthdayConfig config = dao.fetch(UserBirthdayConfig.class, Cnd.NEW().desc("updatedAt")); - String link = Globals.AppDomain + "/platform/staffManage/birthday/manage/h5?id=" + ObjectUtil.defaultIfEmpty(config.getBirthdayUrl(), ""); + String link = Globals.AppDomain + "/platform/staffManage/birthday/manage/h5?id=" + ObjectUtil.defaultIfBlank(config.getBirthdayUrl(), ""); msgApi.sendMsgByBirthday(List.of("DingTalk"), loginNameList, 2, vo.getTitle(), vo.getContent(), "", link); diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/birthday/model/UserBirthdayMsgLog.java b/src/main/java/io/v/nutz/zhgh/staffmanage/birthday/model/UserBirthdayMsgLog.java index cb6b087..fbc535f 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/birthday/model/UserBirthdayMsgLog.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/birthday/model/UserBirthdayMsgLog.java @@ -65,6 +65,6 @@ public class UserBirthdayMsgLog extends BaseModel { @Column @Comment("卡片链接") - @ColDefine(type = ColType.VARCHAR, width = 50) + @ColDefine(type = ColType.VARCHAR, width = 500) private String link; }