From 66ae7d2fe67428c739e8206388d7ad3e63ca5037 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 21 Jul 2022 17:29:08 +0800
Subject: [PATCH] ...

---
 .../io/renren/common/aspect/ActivitiNoticeAspect.java     | 8 ++++----
 .../controller/TAbilityApplicationController.java         | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java
index 888da3b5..591933c7 100644
--- a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java
+++ b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java
@@ -168,7 +168,7 @@ public class ActivitiNoticeAspect {
                 Optional<ResourceDTO> resourceDTO = Optional.ofNullable(resourceService.get(resourceId));
                 kv.get("resourceId");
                 kv.get("id");
-                String content = "【通知】" + userDTO.getRealName() + ",您发起的" + (resourceDTO.isPresent() ? resourceDTO.get().getName() : "") + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + "节点" + finalResult;
+                String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + "节点" + finalResult;
                 SysNoticeDTO dto = new SysNoticeDTO();
                 dto.setType(2);
                 dto.setTitle("流程节点系统通知");
@@ -248,7 +248,7 @@ public class ActivitiNoticeAspect {
                 SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator));
                 kv.get("resourceId");
                 kv.get("id");
-                String content = "【通知】" + userDTO.getRealName() + ",您发起的" + (resourceDTO.isPresent() ? resourceDTO.get().getName() : "申请摄像头列表") + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
+                String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
                 SysNoticeDTO dto = new SysNoticeDTO();
                 dto.setType(2);
                 dto.setTitle("流程结束系统通知");
@@ -274,7 +274,7 @@ public class ActivitiNoticeAspect {
                     SysNoticeDTO dto = new SysNoticeDTO();
                     dto.setType(2);
                     dto.setTitle("流程结束系统通知");
-                    String content = "【通知】" + user.getRealName() + "," + creatorDTO.getRealName() + "发起的" + (resourceDTO.isPresent() ? resourceDTO.get().getName() : "") + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
+                    String content = "【通知】" + user.getRealName() + "," + creatorDTO.getRealName() + "发起的" + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
                     dto.setContent(content); // 通知内容
                     dto.setReceiverType(1);
                     dto.setReceiverTypeIds(userDTO.get().getId().toString());
@@ -354,7 +354,7 @@ public class ActivitiNoticeAspect {
             }, executor).thenRunAsync(() -> { // 审批者
                 try {
                     SysUserDTO owner = sysUserService.get(Long.valueOf(finalCreator));
-                    String content = "【通知】" + owner.getRealName() + "发起的流程" + activitiNoticeOperation.process() + "已进入审核节点：" + activitiNoticeOperation.value() + "；当前审核人指派为您";
+                    String content = "【通知】" + owner.getRealName() + "发起的流程" + activitiNoticeOperation.process() + " 已进入审核节点：" + activitiNoticeOperation.value() + "；当前审核人指派为您";
                     SysNoticeDTO dto = new SysNoticeDTO();
                     dto.setType(2);
                     dto.setTitle("流程流转系统通知");
diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
index 10eaef71..d758d2d6 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
@@ -238,12 +238,13 @@ public class TAbilityApplicationController {
                     put("instanceId", tAbilityApplicationDTOList.get(0).getInstanceId()); // 流程id
                     put("resourceOwnerDept", tAbilityApplicationDTOList.get(0).getResourceOwnerDept()); // 资源所属部门信息
                     put("resources", resourceDTOS);//申请的该部门的能力资源
-                    if (tAbilityApplicationDTOList.get(0).getApproveStatus().equals("通过")) {
-                        put("ended", true);
-                    } else {
+                    if (tAbilityApplicationDTOList.get(0).getApproveStatus().equals("审核中")) {
                         put("ended", false);
+                    } else {
+                        put("ended", true);
                     }
                     put("taskHandleDetailInfo", taskHandleDetailInfo); // 流程详情
+                    put("approveStatus", tAbilityApplicationDTOList.get(0).getApproveStatus());
                     if (!finalCamera.isEmpty()) {
                         put("camera", finalCamera); // 流程详情
                     }