提交修改
This commit is contained in:
parent
813df1c8b3
commit
cc4a2e33f7
@ -1407,7 +1407,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
|
|||||||
List<FlowRecord> preFlowRecords = flowRecordService.selectFlowRecordByRecordIdFlowIndex(currentFlowRecord.getRecordId(), currentFlowRecord.getFlowIndex() - 1);
|
List<FlowRecord> preFlowRecords = flowRecordService.selectFlowRecordByRecordIdFlowIndex(currentFlowRecord.getRecordId(), currentFlowRecord.getFlowIndex() - 1);
|
||||||
if (CollectionUtils.isNotEmpty(preFlowRecords)) {
|
if (CollectionUtils.isNotEmpty(preFlowRecords)) {
|
||||||
for (FlowRecord flowRecord : preFlowRecords) {
|
for (FlowRecord flowRecord : preFlowRecords) {
|
||||||
if (flowRecord.getApprovalStaffId().equals(recordDetailDto.getLoginUserId()) && recordDetailDto.getLoginUserId().equals(resultRecord.getStaffId())) {
|
if (flowRecord.getApprovalStaffId().equals(recordDetailDto.getLoginUserId())
|
||||||
|
&& recordDetailDto.getLoginUserId().equals(resultRecord.getStaffId())
|
||||||
|
//在目标制定的时候和结果录入的时候允许撤回
|
||||||
|
&& (flowRecord.getFlowProcess().equals(new Integer(0)) || flowRecord.getFlowProcess().equals(new Integer(3)))
|
||||||
|
) {
|
||||||
auth.put("recall", 1);
|
auth.put("recall", 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user