From 634968d9a258f621e5c9afb50fcb6df9dc12a022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 4 Aug 2023 17:51:26 +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

---
 .../modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java | 1 +
 1 file changed, 1 insertion(+)

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 e15bb0c01..85c46b992 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
@@ -200,6 +200,7 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 				if(StringUtils.isNotEmpty(data.getOperatorResult())){
 					if(StringUtils.equals(data.getOperatorResult(),ReviewResultEnum.RETURNED.getValue())){
 						if (StringUtils.equals(datas.get(index-1).getOperatorResult(),ReviewResultEnum.TO_TRACK.getValue())
+								|| StringUtils.equals(datas.get(index-1).getOperatorResult(),ReviewResultEnum.INCONFORMITY.getValue())
 								|| StringUtils.equals(datas.get(index-1).getOperatorResult(),ReviewResultEnum.UNINVOLVED.getValue())) {
 							data.setOperatorResult(datas.get(index-1).getOperatorResult());
 						}