From 4a23e330801ca48273ec1ecc0d0ef8080a13aebb Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Mon, 4 Nov 2024 10:42:35 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX=EF=BC=9A=E4=BD=9C=E5=93=81=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=90=8E=EF=BC=8C=E8=8E=B7=E5=8F=96=E7=82=B9=E8=B5=9E?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ai/da/common/constant/CommonConstant.java     |  5 +++++
 .../ai/da/service/impl/MessageCenterServiceImpl.java  | 11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ai/da/common/constant/CommonConstant.java b/src/main/java/com/ai/da/common/constant/CommonConstant.java
index cb84ef3c..71f6c86b 100644
--- a/src/main/java/com/ai/da/common/constant/CommonConstant.java
+++ b/src/main/java/com/ai/da/common/constant/CommonConstant.java
@@ -71,4 +71,9 @@ public class CommonConstant {
 
     public static final String RCA_WORKSHOP_TAG = "#RCAworkshop_2024";
 
+    public static final String PORTFOLIO_DELETED_EN = "Portfolio has been deleted";
+
+    public static final String PORTFOLIO_DELETED_CN = "作品已删除";
+
+
 }
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 c2062a52..f6c1b874 100644
--- a/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
@@ -112,10 +112,15 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
                 notificationVO.setPortfolioId(null);
             }else {
                 Portfolio byId = portfolioService.getById(notificationVO.getPortfolioId());
-                if (Objects.isNull(byId.getPortfolioName())){
-                    notificationVO.setPortfolioName(null);
+                if (!Objects.isNull(byId)){
+                    if (Objects.isNull(byId.getPortfolioName())){
+                        notificationVO.setPortfolioName(null);
+                    }else {
+                        notificationVO.setPortfolioName(byId.getPortfolioName());
+                    }
                 }else {
-                    notificationVO.setPortfolioName(byId.getPortfolioName());
+                    String name = UserContext.getUserHolder().getLanguage().equals("ENGLISH") ? CommonConstant.PORTFOLIO_DELETED_EN : CommonConstant.PORTFOLIO_DELETED_CN;
+                    notificationVO.setPortfolioName(name);
                 }
             }
             // 设置单个人 系统消息是否已读