|
@@ -171,7 +171,7 @@ public abstract class BpmApprovalServiceImpl implements BpmApprovalService {
|
|
|
bpmApproveHisRepository.removeForUpdate();
|
|
bpmApproveHisRepository.removeForUpdate();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- list = mergeSignApproval(list);
|
|
|
|
|
|
|
+ // list = mergeSignApproval(list);
|
|
|
|
|
|
|
|
list = signCallSubApproval(list);
|
|
list = signCallSubApproval(list);
|
|
|
|
|
|
|
@@ -322,16 +322,16 @@ public abstract class BpmApprovalServiceImpl implements BpmApprovalService {
|
|
|
approvalSignPo = addFirstSign(rs, batch, approvalPo);
|
|
approvalSignPo = addFirstSign(rs, batch, approvalPo);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if(taskSignPo.getBatch().equals(batch)) {
|
|
if(taskSignPo.getBatch().equals(batch)) {
|
|
|
mergeSameSignQualfieds(approvalSignPo, approvalPo);
|
|
mergeSameSignQualfieds(approvalSignPo, approvalPo);
|
|
|
} else {
|
|
} else {
|
|
|
batch = taskSignPo.getBatch();
|
|
batch = taskSignPo.getBatch();
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if(!batchSet.contains(batch)) {
|
|
if(!batchSet.contains(batch)) {
|
|
|
approvalSignPo = addFirstSign(rs, batch, approvalPo);
|
|
approvalSignPo = addFirstSign(rs, batch, approvalPo);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
mergeSameSignQualfieds(approvalSignPo, approvalPo);
|
|
mergeSameSignQualfieds(approvalSignPo, approvalPo);
|
|
|
}
|
|
}
|
|
|
|
|
|