diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java
index 7de194f..31448eb 100644
--- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java
+++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java
@@ -214,10 +214,14 @@ public class ProjectDAO {
             return "";
         }
 
-        ProjectDO projectDO = new ProjectDO();
+        ProjectDO projectDO = projectMapper.getProjectById(projectId);
 
         UserDO userDO =  userMapper.getUserById(projectDO.getPrincipalId());
 
+        if (userDO == null) {
+            return "";
+        }
+
         if (userDO.getNickname() == null) {
             return userDO.getUsername();
         } else {
diff --git a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java
index ee16abb..971cb12 100644
--- a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java
+++ b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java
@@ -17,6 +17,8 @@ public class ProjectDailyVO {
 
     private String userName;
 
+    private String nickName;
+
     private Long projectId;
 
     private String projectName;
diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java
index 86ec3f8..ffa5972 100644
--- a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java
@@ -209,11 +209,15 @@ public class ProjectDailyServiceImpl implements ProjectDailyService {
                     projectDAO.getProjectById(projectDailyVO.getProjectId()).getName());
             //设置发送者名称，如果为昵称为空则赋值用户账号
             UserDO senderUser = userDAO.getUserById(projectDailyDO.getUserId());
-            if (senderUser.getNickname() == null) {
-                projectDailyVO.setUserName(senderUser.getUsername());
+
+            if (senderUser == null) {
+                projectDailyVO.setUserName("");
+                projectDailyVO.setNickName("");
             } else {
-                projectDailyVO.setUserName(senderUser.getNickname());
+                projectDailyVO.setUserName(senderUser.getUsername());
+                projectDailyVO.setNickName(senderUser.getNickname());
             }
+
             //设置项目负责人名称
             projectDailyVO.setPrincipalName(projectDAO.getPrincipalUserFromProject(projectDailyDO.getProjectId()));
                 //用户是否有权限删除