From 81db400deccc585015876f640d49482d6471a693 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Mon, 22 Aug 2022 10:14:22 +0800 Subject: [PATCH] npe --- .../common/aspect/ActivitiNoticeAspect.java | 28 ++++++++++++++----- .../controller/AbilityCenterControllerV2.java | 3 +- .../controller/AbilityCenterControllerV3.java | 2 +- 3 files changed, 24 insertions(+), 9 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 7a3eed9c..62aae59d 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 @@ -128,7 +128,13 @@ public class ActivitiNoticeAspect { private void task_complete_notice(final DelegateTask delegateTask, final ActivitiNoticeOperation activitiNoticeOperation) { Map kv = delegateTask.getVariables(); LOGGER.error("表单：{}", JSON.toJSONString(kv)); - final String workKey = TaskListener.EVENTNAME_COMPLETE + kv.get("id").toString(); + String key = null; + if (kv.containsKey("id")) { + key = kv.getOrDefault("id", "").toString(); + } else if (kv.containsKey("_id")) { + key = kv.getOrDefault("_id", "").toString(); + } + final String workKey = TaskListener.EVENTNAME_COMPLETE + key; if (work.contains(workKey)) { LOGGER.error("------------出现重放------------"); return; @@ -167,8 +173,6 @@ public class ActivitiNoticeAspect { String finalResult = result; CompletableFuture.runAsync(() -> { // 发起人 SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator)); - kv.get("resourceId"); - kv.get("id"); String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + "节点" + finalResult; SysNoticeDTO dto = new SysNoticeDTO(); dto.setType(2); @@ -209,7 +213,13 @@ public class ActivitiNoticeAspect { private void end_notice(final DelegateExecution execution, final ActivitiNoticeOperation activitiNoticeOperation) { Map kv = execution.getVariables(); LOGGER.error("表单：{}", JSON.toJSONString(kv)); - final String workKey = ExecutionListener.EVENTNAME_END + kv.get("id").toString(); + String key = null; + if (kv.containsKey("id")) { + key = kv.getOrDefault("id", "").toString(); + } else if (kv.containsKey("_id")) { + key = kv.getOrDefault("_id", "").toString(); + } + final String workKey = ExecutionListener.EVENTNAME_END + key; if (work.contains(workKey)) { LOGGER.error("------------出现重放------------"); return; @@ -248,8 +258,6 @@ public class ActivitiNoticeAspect { String finalResult = result; CompletableFuture.runAsync(() -> { // 发起人 SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator)); - kv.get("resourceId"); - kv.get("id"); String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult; SysNoticeDTO dto = new SysNoticeDTO(); dto.setType(2); @@ -315,7 +323,13 @@ public class ActivitiNoticeAspect { private void assignment_notice(final DelegateTask delegateTask, final ActivitiNoticeOperation activitiNoticeOperation) { Map kv = delegateTask.getVariables(); LOGGER.error("表单：{}", JSON.toJSONString(kv)); - final String workKey = TaskListener.EVENTNAME_ASSIGNMENT + kv.get("id").toString(); + String key = null; + if (kv.containsKey("id")) { + key = kv.getOrDefault("id", "").toString(); + } else if (kv.containsKey("_id")) { + key = kv.getOrDefault("_id", "").toString(); + } + final String workKey = TaskListener.EVENTNAME_ASSIGNMENT + key; if (work.contains(workKey)) { LOGGER.error("------------出现重放------------"); return; diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java index e5f48a31..2de8802b 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java @@ -262,7 +262,8 @@ public class AbilityCenterControllerV2 { put("tAbilityApplicationDTOList", dtoList); // 归属该部门的申请 put("key", processStartDTO.getBusinessKey()); // 归属该部门申请的表单id put("deptId", deptId); // 归属部门 -// put("id", applyFlag); //申请id + put("id", applyFlag); //申请id + put("_id", applyFlag); //申请id put("creator", user == null ? null : user.getId().toString()); // 创建人 put("userId", user == null ? null : user.getId().toString()); // 创建人 put("basic_facilities", basicFacilities); // 是否为基础设施 diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java index 4d9f7758..6d909c59 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java @@ -297,7 +297,7 @@ public class AbilityCenterControllerV3 { put("tAbilityApplicationDTOList", dtoList); // 归属该部门的申请 put("key", processStartDTO.getBusinessKey()); // 归属该部门申请的表单id put("deptId", deptId); // 归属部门 -// put("id", applyFlag); //申请id + put("_id", applyFlag); //申请id put("creator", user == null ? null : user.getId().toString()); // 创建人 put("userId", user == null ? null : user.getId().toString()); // 创建人 put("userDeptId", user == null ? null : user.getDeptId().toString()); // 发起人部门id