From 604c529b42d2f8bda7dbb9105ee4776db3917a3b Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 18 Nov 2025 13:31:18 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=20=E8=A7=86=E9=A2=91=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E7=AB=99=E5=86=85=E4=BF=A1?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MessageCenterServiceImpl.java   | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java b/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
index 69589219..b1652140 100644
--- a/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
@@ -188,7 +188,7 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
         ArrayList<Map<String, Object>> resp = new ArrayList<>();
         HashMap<String, Object> data = new HashMap<>();
         Long count;
-        if (!type.equals("system")) {
+        if (!type.equals("system") ||  Objects.nonNull(receiverId)) {
             // 个人未读消息
             count = getUnreadCountByType(type, receiverId);
         } else {
@@ -382,22 +382,28 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
     public void videoFinishedMsg(Long userId, String projectName, boolean isSuccess) {
         Account account = accountService.getById(userId);
         String language = account.getLanguage();
+        PublishSysNotificationDTO sysNotificationDTO = new PublishSysNotificationDTO();
         Notification notification = new Notification();
         notification.setType("system");
         notification.setReceiverId(userId);
         if (isSuccess) {
             if (language.equals(Language.ENGLISH.name())) {
-                notification.setContent("Your video generation task in Project " + projectName + " is ready!");
+                sysNotificationDTO.setTitle("System Notification");
+                sysNotificationDTO.setContent("Your video generation task in Project " + projectName + " is ready!");
             } else {
-                notification.setContent("您在项目 " + projectName + " 中创建的视频生成任务已完成！");
+                sysNotificationDTO.setTitle("系统通知");
+                sysNotificationDTO.setContent("您在项目 " + projectName + " 中创建的视频生成任务已完成！");
             }
         } else {
             if (language.equals(Language.ENGLISH.name())) {
-                notification.setContent("Your video generation task in Project " + projectName + " has failed.");
+                sysNotificationDTO.setTitle("System Notification");
+                sysNotificationDTO.setContent("Your video generation task in Project " + projectName + " has failed.");
             } else {
-                notification.setContent("视频生成任务失败。");
+                sysNotificationDTO.setTitle("系统通知");
+                sysNotificationDTO.setContent("视频生成任务失败。");
             }
         }
+        notification.setContent(JSON.toJSONString(sysNotificationDTO));
 
         notification.setIsRead(0);
         notification.setCreateTime(LocalDateTime.now());