。。

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

@@ -865,9 +865,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                     		createAudit( mainList, list, i, map1, depot, ongoingStep);
                     		auditFirst = false;
                     	}else{
-                    		if(list2.size()>0){
-                        		createAudit( mainList, list2, i, map1,depot, ongoingStep);
-                    		}
+                        	createAudit( mainList, list2, i, map1,depot, ongoingStep);
                     	}
                     }
                 }else{
@@ -1818,38 +1816,41 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         	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, depot);
-            if(pbList.size()>0 && i <= Integer.valueOf(ongoingStep) && list.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);
-               	}
+            if(basisList.size()>0){
+                List<ProcessBasis> pbList = processBasisService.getBasisByType(basisList.get(0).getType(), null, depot);
+                if(pbList.size()>0 && i <= Integer.valueOf(ongoingStep) && list.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);
             }
-            map1.put("audit", pbList);
+            
 	}
 }