commit
This commit is contained in:
@@ -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<NutMap> 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<String> loginNameList = list.stream().map(v -> v.getString("loginname")).toList();
|
||||
|
||||
|
||||
+2
-2
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user