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

develop #46

Merged
XiaoLFeng merged 10 commits from develop into master 2024-04-25 16:54:11 +08:00
Conversation 0 Commits 10 Files Changed 13 +11 -2
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4b8dc5d699 - Show all commits

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

@ -232,6 +232,10 @@ public class ProjectDAO {
ProjectDO projectDO = projectMapper.getProjectById(projectId); ProjectDO projectDO = projectMapper.getProjectById(projectId);
if (projectDO == null) {
return "项目负责人不存在";
}
UserDO userDO = userMapper.getUserById(projectDO.getPrincipalId()); UserDO userDO = userMapper.getUserById(projectDO.getPrincipalId());
if (userDO == null) { if (userDO == null) {

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

@ -7,6 +7,7 @@ import com.jsl.oa.dao.ProjectDAO;
import com.jsl.oa.dao.ProjectDailyDAO; import com.jsl.oa.dao.ProjectDailyDAO;
import com.jsl.oa.dao.UserDAO; import com.jsl.oa.dao.UserDAO;
import com.jsl.oa.mapper.ProjectDailyMapper; import com.jsl.oa.mapper.ProjectDailyMapper;
import com.jsl.oa.model.dodata.ProjectDO;
import com.jsl.oa.model.dodata.ProjectDailyDO; import com.jsl.oa.model.dodata.ProjectDailyDO;
import com.jsl.oa.model.dodata.UserDO; import com.jsl.oa.model.dodata.UserDO;
import com.jsl.oa.model.vodata.ProjectDailyAddVO; import com.jsl.oa.model.vodata.ProjectDailyAddVO;
@ -210,8 +211,12 @@ public class ProjectDailyServiceImpl implements ProjectDailyService {
// 复制相同的属性值 // 复制相同的属性值
Processing.copyProperties(projectDailyDO, projectDailyVO); Processing.copyProperties(projectDailyDO, projectDailyVO);
// 赋值其他需查询的属性 // 赋值其他需查询的属性
projectDailyVO.setProjectName( ProjectDO projectDO = projectDAO.getProjectById(projectDailyVO.getProjectId());
projectDAO.getProjectById(projectDailyVO.getProjectId()).getName()); if (projectDO == null) {
projectDailyVO.setProjectName(projectDO.getName());
} else {
projectDailyVO.setPrincipalName("项目不存在");
}
//设置发送者名称，如果为昵称为空则赋值用户账号 //设置发送者名称，如果为昵称为空则赋值用户账号
UserDO senderUser = userDAO.getUserById(projectDailyDO.getUserId()); UserDO senderUser = userDAO.getUserById(projectDailyDO.getUserId());