diff --git a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java index d2e1a2e..d2a1deb 100644 --- a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java @@ -32,6 +32,7 @@ public class ProjectDailyVO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updatedAt; + private Boolean isAllowDelete; } 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 d33a025..366691f 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java @@ -197,6 +197,14 @@ public class ProjectDailyServiceImpl implements ProjectDailyService { projectDailyVO.setProjectName( projectDAO.getProjectById(projectDailyVO.getProjectId()).getName()) .setUserName(userDAO.getUserById(projectDailyDO.getUserId()).getNickname()); + //用户是否有权限删除 + if (projectDailyDO.getUserId().equals(projectDAO. + getProjectById(projectDailyVO.getProjectId()).getPrincipalId())) { + projectDailyVO.setIsAllowDelete(true); + } else { + projectDailyVO.setIsAllowDelete(false); + } + // 向 结果封装类数组 添加对应 日报封装类 projectDailyVOS.add(projectDailyVO); } diff --git a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java index 2bf0e09..1c8e34a 100644 --- a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java @@ -281,7 +281,6 @@ public class ReviewServiceImpl implements ReviewService { Integer page, Integer pageSize) { - // 获取审核记录数据 List reviewVOS = getReviewsByResult(request, statue); @@ -355,7 +354,9 @@ public class ReviewServiceImpl implements ReviewService { .setProjectName(projectDAO.getProjectById(reviewDO.getProjectId()).getName()) .setProjectChildName(projectMapper.getProjectChildById( Math.toIntExact(reviewDO.getProjectChildId())).getName()) - .setResult(Processing.turnReviewResult(reviewDO.getReviewResult())); + .setResult(Processing.turnReviewResult(reviewDO.getReviewResult())) + .setSenderId(Long.valueOf(reviewDO.getSenderId())) + .setRecipientId(reviewDO.getRecipientId()); // 赋值可为空属性并进行判断 if (reviewDO.getRecipientId() != null) { reviewVO.setRecipientName(userMapper.getUserById(reviewDO.getRecipientId()).getNickname());