|
|
@@ -674,7 +674,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
|
674
|
674
|
map1.put("list", subList);//子表数据
|
|
675
|
675
|
//审批人数据
|
|
676
|
676
|
if(list.get(0).getType().equals("xzjh") || list.get(0).getType().equals("xzsq")){
|
|
677
|
|
- if(mainList.get(i).getExistProcess().equals(0)){//存在流程
|
|
|
677
|
+ if(mainList.get(i).getExistProcess().equals(0) && i <= Integer.valueOf(list.get(0).getOngoingStep())){//存在流程
|
|
678
|
678
|
QueryWrapper<ProcessBasis> ew3 = new QueryWrapper<>();
|
|
679
|
679
|
ew3.eq("main_id", mainList.get(i).getId());
|
|
680
|
680
|
List<ProcessBasis> basisList = processBasisMapper.selectList(ew3);
|