From e144b8e18af445c312fd4efb828a536ed44013ce Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Thu, 3 Sep 2020 16:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/app/impl/ResultRecordServiceImpl.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 0d8336e4..02acecd1 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -432,13 +432,15 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
         flowRecord.setStatusName(FlowRecordEnum.APPROVALING.getName());
         FlowRecord lastFlowRecordNoStatus = flowRecordService.selectLastFlowNoStatusRecordByRecordId(resultRecordId);
+
         // 如果上一步是开始，则不进行修改，如果上一步是确认中，改成提交，如果上一点是审批中，将上一步改成通过
-        if (lastFlowRecordNoStatus != null
-                && !lastFlowRecordNoStatus.getStatusName().equals(FlowRecordEnum.START.getName())) {
-            lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.APPROVAL.getName());
-        } else if (lastFlowRecordNoStatus != null
-                && lastFlowRecordNoStatus.getStatusName().equals(FlowRecordEnum.CONFIRM.getName())) {
-            lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.COMMIT.getName());
+        if (lastFlowRecordNoStatus != null) {
+            if (!StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.START.getName())) {
+                lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.APPROVAL.getName());
+            } else if (StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.CONFIRM.getName())) {
+                lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.COMMIT.getName());
+            }
+            flowRecordService.updateFlowRecordById(lastFlowRecordNoStatus);
         }
 
         flowRecordService.insertFlowRecord(flowRecord);