Compare commits
No commits in common. "24c45812e8aa4aa004f59eac8276d754b5b88c94" and "cd97498b800a1c730dea2cd6dbc8dac685a4495a" have entirely different histories.
24c45812e8
...
cd97498b80
|
@ -64,7 +64,6 @@ public class ProjectDailyServiceImpl implements ProjectDailyService {
|
|||
Processing.copyProperties(projectDailyAddVO, projectDailyDO);
|
||||
projectDailyDO.setUserId(userId);
|
||||
projectDailyDO.setProjectId(Long.valueOf(projectDailyAddVO.getProjectId()));
|
||||
projectDailyDO.setDailyTime(Processing.convertStringToDate(projectDailyAddVO.getDailyTime()));
|
||||
|
||||
// 向数据库添加数据
|
||||
projectDailyDAO.addProjectDaily(projectDailyDO);
|
||||
|
@ -133,15 +132,8 @@ public class ProjectDailyServiceImpl implements ProjectDailyService {
|
|||
public BaseResponse deleteDaily(Integer dailyId, HttpServletRequest request) {
|
||||
|
||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||
|
||||
ProjectDailyDO projectDailyDO = projectDailyMapper.getDailyById(dailyId);
|
||||
|
||||
if (projectDailyDO == null) {
|
||||
return ResultUtil.error(ErrorCode.PROJECT_DAILY_NOT_EXIST);
|
||||
}
|
||||
|
||||
// 检查用户是否为项目负责人
|
||||
if (!projectDAO.isPrincipalUser(userId, projectDailyDO.getProjectId())) {
|
||||
if (!projectDAO.isPrincipalUser(userId, projectDailyMapper.getDailyById(dailyId).getProjectId())) {
|
||||
return ResultUtil.error(ErrorCode.User_NOT_PROJECT_PRINCIPAL);
|
||||
}
|
||||
|
||||
|
|
|
@ -54,9 +54,11 @@
|
|||
</select>
|
||||
|
||||
|
||||
<select id="getDailyById" parameterType="java.lang.Integer" resultType="com.jsl.oa.model.dodata.ProjectDailyDO">
|
||||
<select id="getDailyById" parameterType="java.lang.Integer"
|
||||
resultType="com.jsl.oa.model.dodata.ProjectDailyDO">
|
||||
select * from organize_oa.oa_project_daily
|
||||
where id = #{id} and is_delete = 0
|
||||
where id = #{id}
|
||||
and is_delete = 0
|
||||
</select>
|
||||
|
||||
<delete id="deleteDailyById" parameterType="java.lang.Integer">
|
||||
|
|
Loading…
Reference in New Issue
Block a user