From 5c17b675078a58b50cd30235290105b81459ba1b Mon Sep 17 00:00:00 2001
From: luozukai <luozukai@okjiaoyu.cn>
Date: Fri, 18 Jan 2019 11:39:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 1 -
 .../java/com/iformall/service/impl/WxFlowServiceImpl.java  | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
index 61db1cb94..68d1e3a42 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
@@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
index b6e2841a7..e4618c3bd 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
@@ -16,6 +16,7 @@ import com.iformall.service.*;
 import com.iformall.utils.Constant;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.lang3.StringUtils;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.engine.*;
 import org.flowable.engine.runtime.Execution;
@@ -207,11 +208,15 @@ public class WxFlowServiceImpl implements WxFlowService {
                 //不是最后一个节点,设置下一个待审批节点代办人
                 if(i != taskAssigneeList.size()-1){
                     assignee = taskAssigneeList.get(i+1);
+                    // 下一个节点没设置代办人
+                    if(StringUtils.isBlank(assignee.get("assignee"))){
+                        continue;
+                    }
                     assigneeArray = assignee.get("assignee").split(",");
                     userName = "";
                     for (String userid:assigneeArray) {
                          MallUserInfo mallUserInfo = this.mallUserInfoService.getById(Long.parseLong(userid));
-                        userName += mallUserInfo.getName()+" ";
+                         userName += mallUserInfo.getName()+" ";
                     }
 
                     wxFlowRecord = new WxFlowRecord();