From f6d498e0bf89991f1d9e88c35c517410dd61d3f5 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 19 Oct 2022 19:43:20 +0800
Subject: [PATCH] update

---
 .../impl/ProcessInfoDetailEOServiceImpl.java  |  3 ++
 .../impl/ProcessInfoEOServiceImpl.java        | 28 +++++++++++--------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java
index 89f5ae0d2..cd0617cd6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java
@@ -18,6 +18,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description: 流程信息明细表
@@ -26,6 +28,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Version: V1.0
  */
 @Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class ProcessInfoDetailEOServiceImpl extends ServiceImpl<ProcessInfoDetailEOMapper, ProcessInfoDetailEO> implements IProcessInfoDetailEOService {
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
index 7bc7a9b8c..3663525d1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
@@ -32,6 +32,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description: 流程信息表
@@ -40,6 +42,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Version: V1.0
  */
 @Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, ProcessInfoEO> implements IProcessInfoEOService {
 
 	@Autowired
@@ -305,18 +308,21 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 						}).map(SysUser::getUsername).collect(Collectors.joining(","));
 						data.setLastAssigneeName(lastUserName);
 					}
-					if(StringUtils.isNotEmpty(data.getAssignee())){
-						String[] assigneeArr = data.getAssignee().split(",");
-						String currentUserName = sysUserList.stream().filter(sysUser -> {
-							boolean flag = false;
-							for (String assignee : assigneeArr) {
-								if (StringUtils.equals(assignee, sysUser.getId())) {
-									flag = true;
+					//如果流程没有结束，才可以展示当前处理人。
+					if(!StringUtils.equals(data.getStatus(),TodoCenterStatusEnum.COMPLETED.getValue())){
+						if(StringUtils.isNotEmpty(data.getAssignee())){
+							String[] assigneeArr = data.getAssignee().split(",");
+							String currentUserName = sysUserList.stream().filter(sysUser -> {
+								boolean flag = false;
+								for (String assignee : assigneeArr) {
+									if (StringUtils.equals(assignee, sysUser.getId())) {
+										flag = true;
+									}
 								}
-							}
-							return flag;
-						}).map(SysUser::getUsername).collect(Collectors.joining(","));
-						data.setAssigneeName(currentUserName);
+								return flag;
+							}).map(SysUser::getUsername).collect(Collectors.joining(","));
+							data.setAssigneeName(currentUserName);
+						}
 					}
 				}
 				data.setProjectName(data.getProjectName() + "-" + data.getYearName());