From fdbb2b73910384a19e496b85b5b4985c2d218dcc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 17 五月 2020 14:18:53 +0800
Subject: [PATCH] 调试图片下载bug
---
CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java b/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
index 67499d0..7b3f9b9 100644
--- a/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
+++ b/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
@@ -176,9 +176,9 @@
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey("complaint")
.taskAssignee(user.getUserId());
- if(!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())){
+ if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("complaint");
- }else if(!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())){
+ } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("complaitDealUser");
}
@@ -196,10 +196,10 @@
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey("complaint")
- .taskAssignee(user.getUserId()) ;
- if(!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())){
+ .taskAssignee(user.getUserId());
+ if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("complaint");
- }else if(!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())){
+ } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("complaitDealUser");
}
@@ -276,6 +276,7 @@
/**
* 鑾峰彇浠诲姟褰撳墠澶勭悊浜�
+ *
* @param complaintDto
* @return
*/
@@ -283,10 +284,18 @@
TaskService taskService = processEngine.getTaskService();
Task task = taskService.createTaskQuery().processInstanceBusinessKey(complaintDto.getComplaintId()).singleResult();
+
+ if (task == null) {
+ complaintDto.setCurrentUserId("");
+ complaintDto.setCurrentUserName("");
+ complaintDto.setCurrentUserTel("");
+ return complaintDto;
+ }
+
String userId = task.getAssignee();
List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(new String[]{userId});
- if(users == null || users.size() == 0){
+ if (users == null || users.size() == 0) {
complaintDto.setCurrentUserId("");
complaintDto.setCurrentUserName("");
complaintDto.setCurrentUserTel("");
--
Gitblit v1.8.0