wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

npe

This commit is contained in:
wangliwen 2022-05-12 10:50:44 +08:00
parent 939864d0f6
commit 9652a63dd5
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/common/controller/CensusController.java
View File

@ -121,7 +121,7 @@ public class CensusController {
}); });
CompletableFuture<Void> pvAmount = CompletableFuture.supplyAsync(() -> { // 平台访问量 CompletableFuture<Void> pvAmount = CompletableFuture.supplyAsync(() -> { // 平台访问量
return 0; return 0; // 暂时返回0
}).thenAccept(sum -> { }).thenAccept(sum -> {
result.add(new HashMap<String, Object>() { result.add(new HashMap<String, Object>() {
{ {

2
renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
View File

@ -267,7 +267,7 @@ public class ActHistoryService {
dto.setResourceId(abilityApplicationDTO.getResourceId()); dto.setResourceId(abilityApplicationDTO.getResourceId());
} else { } else {
TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey())); TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey()));
if (resourceMountApplyDTO != null) { if (resourceMountApplyDTO != null && resourceMountApplyDTO.getResourceDTO() != null) {
dto.setName(resourceMountApplyDTO.getResourceDTO().getName()); dto.setName(resourceMountApplyDTO.getResourceDTO().getName());
dto.setResourceId(resourceMountApplyDTO.getResourceDTO().getId().toString()); dto.setResourceId(resourceMountApplyDTO.getResourceDTO().getId().toString());
} else { } else {

5
renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java
View File

@ -150,7 +150,8 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti
logger.error("第二级别审批仍然为 " + bigDateDeptName); logger.error("第二级别审批仍然为 " + bigDateDeptName);
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "默认通过"); taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "默认通过");
taskService.complete(delegateTask.getId(), delegateTask.getVariables()); taskService.complete(delegateTask.getId(), delegateTask.getVariables());
endTake(delegateTask.getVariables()); return;
// endTake(delegateTask.getVariables());
} }
} else { } else {
logger.error("表单内单位名称：" + abilityApplicationDTO.getUnit()); logger.error("表单内单位名称：" + abilityApplicationDTO.getUnit());
@ -178,7 +179,7 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti
if ("免批申请".equals(resource.getShareCondition())) { // 针对免批资源申请 if ("免批申请".equals(resource.getShareCondition())) { // 针对免批资源申请
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "免批资源申请默认通过"); taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "免批资源申请默认通过");
taskService.complete(delegateTask.getId(), delegateTask.getVariables()); taskService.complete(delegateTask.getId(), delegateTask.getVariables());
endTake(delegateTask.getVariables()); // endTake(delegateTask.getVariables());
} }
}); });