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 9946438..15207d4 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java @@ -7,6 +7,7 @@ import com.jsl.oa.dao.ProjectDAO; import com.jsl.oa.dao.ProjectDailyDAO; import com.jsl.oa.dao.UserDAO; import com.jsl.oa.mapper.ProjectDailyMapper; +import com.jsl.oa.mapper.ProjectMapper; import com.jsl.oa.model.dodata.ProjectDO; import com.jsl.oa.model.dodata.ProjectDailyDO; import com.jsl.oa.model.dodata.UserDO; @@ -48,6 +49,7 @@ public class ProjectDailyServiceImpl implements ProjectDailyService { private final UserDAO userDAO; private final ProjectDailyDAO projectDailyDAO; private final ProjectDailyMapper projectDailyMapper; + private final ProjectMapper projectMapper; private final MessageService messageService; @@ -59,9 +61,9 @@ public class ProjectDailyServiceImpl implements ProjectDailyService { // 从请求体中获取项目id Integer projectId = projectDailyAddVO.getProjectId(); // 检查项目是否存在 - if (!projectDAO.isExistProjectById(Long.valueOf(projectId))) { + if (projectMapper.getNotDeleteProjectById(Long.valueOf(projectId)) == null) { return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST); - } + } // 赋值数据库表实体类相关属性 ProjectDailyDO projectDailyDO = new ProjectDailyDO(); diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java index 978b185..f446a0e 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -624,6 +624,11 @@ public class ProjectServiceImpl implements ProjectService { } for (Long id1 : id) { + + if (projectMapper.getNotDeleteProjectById(id1) == null) { + return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST); + } + if (!projectDAO.isPrincipalUser(Processing.getAuthHeaderToUserId(request), id1)) { return ResultUtil.error(ErrorCode.NOT_PERMISSION); }