WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch: 修正日报模块判空
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 15s
Details

Browse Source 
增加昵称字段给前端
This commit is contained in:
xiangZr-hhh 2024-04-20 19:02:36 +08:00
parent 1d0bb44805
commit ba4ed9fe5d
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/jsl/oa/dao/ProjectDAO.java
View File

@ -214,10 +214,14 @@ public class ProjectDAO {
return ""; return "";
} }
ProjectDO projectDO = new ProjectDO(); ProjectDO projectDO = projectMapper.getProjectById(projectId);
UserDO userDO = userMapper.getUserById(projectDO.getPrincipalId()); UserDO userDO = userMapper.getUserById(projectDO.getPrincipalId());
if (userDO == null) {
return "";
}
if (userDO.getNickname() == null) { if (userDO.getNickname() == null) {
return userDO.getUsername(); return userDO.getUsername();
} else { } else {

2
src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java
View File

@ -17,6 +17,8 @@ public class ProjectDailyVO {
private String userName; private String userName;
private String nickName;
private Long projectId; private Long projectId;
private String projectName; private String projectName;

10
src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java
View File

@ -209,11 +209,15 @@ public class ProjectDailyServiceImpl implements ProjectDailyService {
projectDAO.getProjectById(projectDailyVO.getProjectId()).getName()); projectDAO.getProjectById(projectDailyVO.getProjectId()).getName());
//设置发送者名称，如果为昵称为空则赋值用户账号 //设置发送者名称，如果为昵称为空则赋值用户账号
UserDO senderUser = userDAO.getUserById(projectDailyDO.getUserId()); UserDO senderUser = userDAO.getUserById(projectDailyDO.getUserId());
if (senderUser.getNickname() == null) {
projectDailyVO.setUserName(senderUser.getUsername()); if (senderUser == null) {
projectDailyVO.setUserName("");
projectDailyVO.setNickName("");
} else { } else {
projectDailyVO.setUserName(senderUser.getNickname()); projectDailyVO.setUserName(senderUser.getUsername());
projectDailyVO.setNickName(senderUser.getNickname());
} }
//设置项目负责人名称 //设置项目负责人名称
projectDailyVO.setPrincipalName(projectDAO.getPrincipalUserFromProject(projectDailyDO.getProjectId())); projectDailyVO.setPrincipalName(projectDAO.getPrincipalUserFromProject(projectDailyDO.getProjectId()));
//用户是否有权限删除 //用户是否有权限删除