|
@@ -485,13 +485,18 @@ public class ProjectApplicationApproveService extends BaseService<ProjectApplica
|
|
|
isNextChecker = true;
|
|
isNextChecker = true;
|
|
|
if (isNextChecker) {
|
|
if (isNextChecker) {
|
|
|
//当前节点是否已经审核过(两个用户同时审核)
|
|
//当前节点是否已经审核过(两个用户同时审核)
|
|
|
- if (null != approval.getBefore_approveStatus() && null != latestApproval.getBefore_approvalstatus()
|
|
|
|
|
- && approval.getBefore_approveStatus().equals(latestApproval.getBefore_approvalstatus())) {
|
|
|
|
|
|
|
+ if (
|
|
|
|
|
+ null != approval.getBefore_approveStatus()
|
|
|
|
|
+ && null != latestApproval.getBefore_approvalstatus()
|
|
|
|
|
+ && approval.getBefore_approveStatus().equals(latestApproval.getBefore_approvalstatus())
|
|
|
|
|
+ ) {
|
|
|
//已经审核过
|
|
//已经审核过
|
|
|
isNextChecker = false;
|
|
isNextChecker = false;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ //不检验了
|
|
|
|
|
+ return true;
|
|
|
} else {
|
|
} else {
|
|
|
//存在老数据没有下一级审核人
|
|
//存在老数据没有下一级审核人
|
|
|
isNextChecker = true;
|
|
isNextChecker = true;
|