From 25f6988e65d300343c44dec7920e702e34fcf807 Mon Sep 17 00:00:00 2001 From: dengqichen Date: Thu, 29 May 2025 11:33:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E4=BA=BA=E5=90=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reminder/service/ZentaoTaskReminderService.java | 13 ++++++++----- src/main/resources/application.yml | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zeodao/reminder/service/ZentaoTaskReminderService.java b/src/main/java/com/zeodao/reminder/service/ZentaoTaskReminderService.java index 200f559..5fc3ce6 100644 --- a/src/main/java/com/zeodao/reminder/service/ZentaoTaskReminderService.java +++ b/src/main/java/com/zeodao/reminder/service/ZentaoTaskReminderService.java @@ -110,18 +110,21 @@ public class ZentaoTaskReminderService { } message.append("\n\n"); - // 任务详情 - 不在消息内容中@人,只显示姓名 + // 任务详情 - 显示真实姓名,但用用户名匹配手机号 for (Map.Entry> entry : tasksByAssignee.entrySet()) { - String assigneeRealName = entry.getKey(); + String assignedTo = entry.getKey(); // 这是用户名 List tasks = entry.getValue(); - // 收集手机号用于@人 - String phone = userMappingService.getPhoneByRealName(group, assigneeRealName); + // 用用户名匹配手机号 + String phone = userMappingService.getPhoneByRealName(group, assignedTo); if (phone != null) { mentionedMobiles.add(phone); } - message.append(assigneeRealName).append(" (").append(tasks.size()).append("个任务)\n"); + // 显示真实姓名(从任务中获取) + String realName = tasks.get(0).getAssignedToRealName(); + String displayName = (realName != null && !realName.isEmpty()) ? realName : assignedTo; + message.append(displayName).append(" (").append(tasks.size()).append("个任务)\n"); for (ZentaoTask task : tasks) { // 简化任务状态图标 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f36269a..f500615 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -27,7 +27,7 @@ task: password: "Lianyu!@#~123456" # 请替换为实际的禅道密码 project-id: 38 # 项目ID kanban-id: 39 # 看板ID(看板模式项目需要) - # 用户映射:禅道用户名/邮箱/真实姓名 -> 企业微信手机号 + # 用户映射:禅道用户名 -> 企业微信手机号(显示使用真实姓名) user-mapping: "dengqichen": "18525522818" "songwei": "15724574541"