提交修改
This commit is contained in:
parent
4c131847c5
commit
176209f9cd
@ -264,13 +264,16 @@ public class ResultRecordController extends AbstractController {
|
|||||||
}
|
}
|
||||||
String superStaff = recordAuthService.selectByStaffId(resultRecord.getStaffId());
|
String superStaff = recordAuthService.selectByStaffId(resultRecord.getStaffId());
|
||||||
int fileCount = recordFileService.selectRecordFileCountByRecordId(resultRecord.getId());
|
int fileCount = recordFileService.selectRecordFileCountByRecordId(resultRecord.getId());
|
||||||
|
//表示是自己查看详情
|
||||||
if(resultRecord.getStaffId().equals(getUserId())){
|
if(resultRecord.getStaffId().equals(getUserId())){
|
||||||
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdTypeStatus(req.getRecordResultId(),resultRecord.getType(),0);
|
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdTypeStatus(req.getRecordResultId(), resultRecord.getType(), 0);
|
||||||
if(flowRecords!=null && flowRecords.size() == 2) { // 表示可以撤回
|
if (flowRecords != null && flowRecords.size() == 2) { // 表示可以撤回
|
||||||
auth.setCancel(1);
|
auth.setCancel(1);
|
||||||
}
|
}
|
||||||
if(flowRecords!=null && flowRecords.size() >= 2){
|
// 审批人是自己,不提供催办按钮,流程结束不显示
|
||||||
|
if (flowRecords != null && flowRecords.size() >= 2 &&
|
||||||
|
!getUserId().equals(resultRecord.getCurrentApprovalStaffId()) &&
|
||||||
|
resultRecord.getCurrentApprovalStaffId() != null) {
|
||||||
auth.setSubmited(1);
|
auth.setSubmited(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user