From 6af75daba39b77288d3410b0d96de1fc53014f62 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 16 一月 2023 22:55:22 +0800
Subject: [PATCH] 优化 工作流相关说明

---
 service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/GetOaWorkflowBMOImpl.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/GetOaWorkflowBMOImpl.java b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/GetOaWorkflowBMOImpl.java
index bcf97db..c12f035 100644
--- a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/GetOaWorkflowBMOImpl.java
+++ b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/GetOaWorkflowBMOImpl.java
@@ -1,13 +1,10 @@
 package com.java110.oa.bmo.oaWorkflow.impl;
 
 import com.java110.dto.oaWorkflow.OaWorkflowDto;
-import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
 import com.java110.entity.audit.AuditUser;
-import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO;
-import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
+import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
 import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
 import com.java110.oa.bmo.oaWorkflow.IGetOaWorkflowBMO;
-import com.java110.utils.util.Assert;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -25,7 +22,7 @@
 
 
     @Autowired
-    private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
+    private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
 
 
     /**
@@ -40,7 +37,7 @@
         List<OaWorkflowDto> oaWorkflowDtos = null;
         if (count > 0) {
             oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
-            computeUserUndoOrder(oaWorkflowDtos);
+            computeUserUndoOrder(oaWorkflowDtos,oaWorkflowDto);
         } else {
             oaWorkflowDtos = new ArrayList<>();
         }
@@ -52,13 +49,13 @@
         return responseEntity;
     }
 
-    private void computeUserUndoOrder(List<OaWorkflowDto> oaWorkflowDtos) {
+    private void computeUserUndoOrder(List<OaWorkflowDto> oaWorkflowDtos , OaWorkflowDto tmpOaWorkflowDto) {
 
         for(OaWorkflowDto oaWorkflowDto: oaWorkflowDtos){
             if(!"C".equals(oaWorkflowDto.getState())){
                 continue;
             }
-
+            oaWorkflowDto.setUserId(tmpOaWorkflowDto.getUserId());
             doComputeUserUndoOrder(oaWorkflowDto);
         }
     }

--
Gitblit v1.8.0