From 9ab6d1621b93433f690bbc76f1ceab08ef9e7835 Mon Sep 17 00:00:00 2001
From: xiangZr-hhh <“2774915446@qq.com”>
Date: Fri, 19 Apr 2024 18:13:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E6=8A=A5=E6=A8=A1=E5=9D=97=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加部分属性
---
 src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java | 1 +
 .../com/jsl/oa/services/impl/ProjectDailyServiceImpl.java | 8 ++++++++
 .../java/com/jsl/oa/services/impl/ReviewServiceImpl.java  | 5 +++--
 3 files changed, 12 insertions(+), 2 deletions(-)

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<ReviewVO> 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());