Compare commits
No commits in common. "55aa2640cf292dd626b68542dcb748621eab7103" and "11c034928228330de5399da4094a30300be8723a" have entirely different histories.
55aa2640cf
...
11c0349282
|
@ -110,6 +110,4 @@ public interface ProjectMapper {
|
|||
|
||||
@Select("select * from organize_oa.oa_project_work where id=#{id}")
|
||||
ProjectWorkDO getWorkById(Integer id);
|
||||
@Select("select principal_id from organize_oa.oa_project_work where id=#{pid}")
|
||||
Long getPirIdbyWorkid(Long pid);
|
||||
}
|
||||
|
|
|
@ -11,9 +11,11 @@ public class ProjectWorkVO {
|
|||
private Long pid;
|
||||
@NotNull(message = "项目id不能为空")
|
||||
private Long projectId;
|
||||
|
||||
private Long principalId;
|
||||
@NotNull(message = "周期不能为空")
|
||||
private Integer cycle;
|
||||
|
||||
private Integer workLoad;
|
||||
@NotNull(message = "类型不能为空")
|
||||
private Integer type;
|
||||
|
|
|
@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest;
|
|||
import java.sql.Timestamp;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* <h1>项目服务层实现类</h1>
|
||||
|
@ -65,24 +64,7 @@ public class ProjectServiceImpl implements ProjectService {
|
|||
@Override
|
||||
public BaseResponse projecWorktAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO) {
|
||||
log.info("\t> 执行 Service 层 ProjectService.projectWorkAdd 方法");
|
||||
//获取用户id
|
||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||
//是否是增加子系统
|
||||
if(projectWorkVO.getType() == 0 ){
|
||||
//是否是老师
|
||||
if (Processing.checkUserIsTeacher(request, roleMapper)){
|
||||
projectDAO.projectWorkAdd(projectWorkVO);
|
||||
}else {
|
||||
return ResultUtil.error(ErrorCode.NOT_PERMISSION);
|
||||
}
|
||||
}//增加子模块
|
||||
else {
|
||||
//是否是子系统的负责人
|
||||
if(Objects.equals(userId, projectMapper.getPirIdbyWorkid(projectWorkVO.getPid()))){
|
||||
projectDAO.projectWorkAdd(projectWorkVO);
|
||||
}else return ResultUtil.error(ErrorCode.NOT_PERMISSION);
|
||||
}
|
||||
|
||||
projectDAO.projectWorkAdd(projectWorkVO);
|
||||
return ResultUtil.success("添加成功");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user