From 9652a63dd5c278c7e333980a648aac363dcd6906 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 12 May 2022 10:50:44 +0800
Subject: [PATCH] npe

---
 .../java/io/renren/common/controller/CensusController.java   | 2 +-
 .../renren/modules/activiti/service/ActHistoryService.java   | 2 +-
 .../modules/processForm/listener/CorrectionListener.java     | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
index 3d3cfa45..df83c906 100644
--- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
+++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
@@ -121,7 +121,7 @@ public class CensusController {
         });
 
         CompletableFuture<Void> pvAmount = CompletableFuture.supplyAsync(() -> { // 平台访问量
-            return 0;
+            return 0; // 暂时返回0
         }).thenAccept(sum -> {
             result.add(new HashMap<String, Object>() {
                 {
diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
index c371739d..8d27c106 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
@@ -267,7 +267,7 @@ public class ActHistoryService {
                     dto.setResourceId(abilityApplicationDTO.getResourceId());
                 } else {
                     TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey()));
-                    if (resourceMountApplyDTO != null) {
+                    if (resourceMountApplyDTO != null && resourceMountApplyDTO.getResourceDTO() != null) {
                         dto.setName(resourceMountApplyDTO.getResourceDTO().getName());
                         dto.setResourceId(resourceMountApplyDTO.getResourceDTO().getId().toString());
                     } else {
diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java
index be399e83..a2b92920 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java
@@ -150,7 +150,8 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti
                 logger.error("第二级别审批仍然为 " + bigDateDeptName);
                 taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "默认通过");
                 taskService.complete(delegateTask.getId(), delegateTask.getVariables());
-                endTake(delegateTask.getVariables());
+                return;
+//                endTake(delegateTask.getVariables());
             }
         } else {
             logger.error("表单内单位名称：" + abilityApplicationDTO.getUnit());
@@ -178,7 +179,7 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti
             if ("免批申请".equals(resource.getShareCondition())) { // 针对免批资源申请
                 taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "免批资源申请默认通过");
                 taskService.complete(delegateTask.getId(), delegateTask.getVariables());
-                endTake(delegateTask.getVariables());
+//                endTake(delegateTask.getVariables());
             }
         });