。。。

src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -654,25 +654,38 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             if(list.size()>0){
             	 depot = list.get(0).getDepotId();
                  ongoingStep = Integer.valueOf(list.get(0).getOngoingStep());
-                if(list2.size()>0){
-                	 depot = list2.get(0).getDepotId();
-                     ongoingStep = Integer.valueOf(list2.get(0).getOngoingStep());
-                }
-        		
-                if(list.get(0).getResult() == 0){ //如果是多流程 则把审批数据分开
-                	int index = 0;
-                	for (int i = 0; i < list.size(); i++) {
-                    	if(list.get(i).getResult() == 1){
-                    		index = i;
-                    		break;
-                    	}
-            		}
-                	for (int i = 0; i < list.size(); i++) {
-						if( i >= index){
-							list2.add(list.get(i));
-						}
-					}
-                }
+                 
+                 //如果是多流程 则把审批数据分开
+                 QueryWrapper<ProcessAudit> ew1 = new QueryWrapper<>();
+                 ew1.eq("process_id", processId);
+                 ew1.eq("result", 1);
+                 List<ProcessAudit> list1 = processAuditMapper.selectList(ew1);
+                 if(list1.size()>1){ //多流程
+                	 QueryWrapper<ProcessAudit> ew2 = new QueryWrapper<>();
+                     ew2.eq("process_id", processId);
+                     ew2.eq("result", 1);
+                     ew2.eq("type", list1.get(1).getType());
+                     list2 = processAuditMapper.selectList(ew2);
+                	/*int index = 0;
+                	boolean flag = true;
+                 	for (int i = 0; i < list.size(); i++) {
+                     	if(list.get(i).getResult() == 1){
+                     		index = i;
+                     		flag = false;
+                     		break;
+                     	}
+             		}
+                 	for (int i = 0; i < list.size(); i++) {
+ 						if( i >= index){
+ 							list2.add(list.get(i));
+ 						}
+ 					}*/
+	                 if(list2.size()>0){
+	                	 depot = list2.get(0).getDepotId();
+	                     ongoingStep = Integer.valueOf(list2.get(0).getOngoingStep());
+	                 }
+                 }
+                	
             }
         }