From 2197035766b14f35b65f09fe7bc3bc60a543fced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 28 Jul 2023 14:46:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E5=9B=9E=E5=90=8E?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wkflow/service/impl/ProcessHistoryEOServiceImpl.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
index 6589b78a6..e15bb0c01 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
@@ -199,7 +199,10 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 				}
 				if(StringUtils.isNotEmpty(data.getOperatorResult())){
 					if(StringUtils.equals(data.getOperatorResult(),ReviewResultEnum.RETURNED.getValue())){
-						data.setOperatorResult(datas.get(index-1).getOperatorResult());
+						if (StringUtils.equals(datas.get(index-1).getOperatorResult(),ReviewResultEnum.TO_TRACK.getValue())
+								|| StringUtils.equals(datas.get(index-1).getOperatorResult(),ReviewResultEnum.UNINVOLVED.getValue())) {
+							data.setOperatorResult(datas.get(index-1).getOperatorResult());
+						}
 					}
 					data.setOperatorResultName(ReviewResultEnum.getTextByValue(data.getOperatorResult(),cut));
 				}