From 5e97b14f62f6a2b36fda52411b4711eed196dc26 Mon Sep 17 00:00:00 2001
From: wangzhijiang <1358525938@qq.com>
Date: Mon, 29 Jan 2024 14:19:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=B5=81=E7=A8=8B-=E6=B5=81=E7=A8=8B=E5=9B=BE?=
 =?UTF-8?q?=E3=80=81=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IBusProcessHistoryServiceImpl.java   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java
index cb1aa80e..3d688703 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java
@@ -123,18 +123,20 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl<BusProcessHistory
         List<BusProcessHistory> results = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(datas)) {
             for (BusProcessHistory data : datas) {
-                ResponseMessage<UserVO> assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(data.getUserId());
-                String userName = "";
-                if(assignee.getData()!=null){
-                    if (assignee.getData().getDisableFlag() == 1) {
-                        userName = assignee.getData().getUname() + "("+ assignee.getData().getUsid() +")" + "(已禁用)";
+                if (StringUtils.isNotEmpty(data.getUserId())) {
+                    ResponseMessage<UserVO> assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(data.getUserId());
+                    String userName = "";
+                    if (assignee.getData() != null) {
+                        if (assignee.getData().getDisableFlag() == 1) {
+                            userName = assignee.getData().getUname() + "(" + assignee.getData().getUsid() + ")" + "(已禁用)";
+                        } else {
+                            userName = assignee.getData().getUname() + "(" + assignee.getData().getUsid() + ")";
+                        }
                     } else {
-                        userName = assignee.getData().getUname() + "(" + assignee.getData().getUsid() + ")";
+                        userName = data.getUserId();
                     }
-                } else {
-                    userName = data.getUserId();
+                    data.setUserName(userName);
                 }
-                data.setUserName(userName);
 
                 data.setTaskStatusShow(TaskStatusEnum.getLabelByValue(data.getTaskStatus()));
                 String taskKeyShow = "";
@@ -291,7 +293,7 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl<BusProcessHistory
             String taskStatus = "";
             String userNames = "";
             if (CollectionUtils.isNotEmpty(bphListByTaskKey)) {
-                userNames = bphListByTaskKey.stream().map(BusProcessHistory::getUserName).distinct().collect(Collectors.joining(","));
+                userNames = bphListByTaskKey.stream().filter(bph -> StringUtils.isNotEmpty(bph.getUserName())).map(BusProcessHistory::getUserName).distinct().collect(Collectors.joining(","));
                 taskStatus = TaskStatusEnum.DONE.getValue();
                 for (BusProcessHistory busProcessHistory : bphListByTaskKey) {
                     if (StringUtils.isEmpty(busProcessHistory.getTaskId())