，，

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

@@ -647,19 +647,33 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         List<ProcessAudit> list = processAuditMapper.selectList(ew);
         map.put("data", list);
         
-        int depot = list.get(0).getDepotId();
-        int 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){ //如果是多流程 则把审批数据分开
-        	for (ProcessAudit processAudit : list) {
-				if(processAudit.getResult() == 1){
-					list2.add(processAudit);
-				}
-			}
+        int depot = 0;
+        int ongoingStep = 0;
+        
+        if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
+            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));
+						}
+					}
+                }
+            }
         }
 
         //流程基础数据
@@ -689,64 +703,21 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 HashMap<String, Object> map1 = Maps.newHashMap();
                 map1.put("step", mainList.get(i));//主表数据
                 map1.put("list", subList);//子表数据
-                //审批人数据
-                if(mainList.get(i).getExistProcess().equals(0)){
-                	if(auditFirst){
-                		createAudit( mainList, list, i, map1, depot, ongoingStep);
-                		auditFirst = false;
-                	}else{
-                		createAudit( mainList, list2, i, map1,depot, ongoingStep);
-                		
-                	}
+                if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
+                	
+                    //审批人数据
+                    if(mainList.get(i).getExistProcess().equals(0)){
+                    	if(auditFirst){
+                    		createAudit( mainList, list, i, map1, depot, ongoingStep);
+                    		auditFirst = false;
+                    	}else{
+                    		createAudit( mainList, list2, i, map1,depot, ongoingStep);
+                    		
+                    	}
+                    }
                 }
-                /*if(list.get(0).getType().equals("xzjh")  mainList.get(i).getType()){
-            		createAudit( mainList, list, i, map1);
-            	}else if(list2.size()>0){
-            		createAudit( mainList, list2, i, map1);
-            	}*/
-                
                 process.add(map1);
-                /*if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
-                	if(mainList.get(i).getExistProcess().equals(0) && i <= Integer.valueOf(list.get(0).getOngoingStep())){//存在流程
-                    	QueryWrapper<ProcessBasis> ew3 = new QueryWrapper<>();
-                        ew3.eq("main_id", mainList.get(i).getId());
-                        List<ProcessBasis> basisList = processBasisMapper.selectList(ew3);
-                        List<ProcessBasis> pbList = processBasisService.getBasisByType(basisList.get(0).getType(), null, list.get(0).getDepotId());
-                        if(pbList.size()>0){
-                           	
-                           	//判断是否是通过
-                           	boolean flag = list.get(0).getAuditState().equals(2);
-                           	//保管员
-                   			pbList.get(0).setAuditTime(list.get(0).getApplyTime());//保管员的时间为 申请时间
-                   			pbList.get(0).setContent(list.get(0).getApplyPeople());//保管员为申请人
-                           	for (int j = 0; j < pbList.size(); j++) {
-                           		    if(j==0)continue;//保管员 不做处理
-                           		    //审批人
-                           		    ProcessBasis item = pbList.get(j);
-                           			if(j-1<=list.size()-1){
-                           				// 业务
-                           				ProcessAudit audit = list.get(j-1);
-                           				item.setAuditTime(audit.getAuditTime());
-                           				item.setContent(audit.getToPeople());
-                           				if(flag){//不通过
-                                   			if(j-1==list.size()-1){
-                                   				item.setAuditState(2);
-                                   			}else{
-                                   				item.setAuditState(1);
-                                   			}
-                                   		}else{
-                                   			item.setAuditState(audit.getAuditState());
-                                   		}
-                           				
-                           			}
-                   			}
-                           	if(pbList.get(1).getAuditState().equals(4) || pbList.get(1).getAuditState().equals(3)){
-                           		pbList.get(1).setAuditState(1);
-                           	}
-                        	map1.put("audit", pbList);
-                        }
-                    }
-                }*/
+                
             }
         }else{
         	HashMap<String, Object> map1 = Maps.newHashMap();
@@ -1541,6 +1512,12 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                        			}
                        		}else{
                        			item.setAuditState(audit.getAuditState());
+                       			/*if(audit.getAuditState() == null){
+                       				item.setAuditState(0);
+                       			}else{
+                       				
+                       			}*/
+                       			
                        		}
                				
                			}