提交修改

This commit is contained in:
quyixiao 2021-01-08 10:00:17 +08:00
parent a6d254bdd8
commit d9da3e205c

View File

@ -1352,7 +1352,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
auth = getAuth(currentResultRecord.getFlowStaffIdRole()); auth = getAuth(currentResultRecord.getFlowStaffIdRole());
flowRecordId = currentResultRecord.getId(); flowRecordId = currentResultRecord.getId();
} }
}
List<FlowRecord> preFlowRecords = flowRecordService.selectFlowRecordByRecordIdFlowIndex(currentResultRecord.getRecordId(), currentResultRecord.getFlowIndex() - 1); List<FlowRecord> preFlowRecords = flowRecordService.selectFlowRecordByRecordIdFlowIndex(currentResultRecord.getRecordId(), currentResultRecord.getFlowIndex() - 1);
if(CollectionUtils.isNotEmpty(preFlowRecords)){ if(CollectionUtils.isNotEmpty(preFlowRecords)){
for(FlowRecord flowRecord:preFlowRecords){ for(FlowRecord flowRecord:preFlowRecords){
@ -1362,6 +1361,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
} }
} }
} }
}
//如果是绩效管理员有一键催办功能 //如果是绩效管理员有一键催办功能
StaffRole staffRole = staffRoleService.selectStaffRolesByStaffIdDepartmentLevelList(recordDetailDto.getLoginUserId(), StaffRole staffRole = staffRoleService.selectStaffRolesByStaffIdDepartmentLevelList(recordDetailDto.getLoginUserId(),
Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName(), RoleEnums.MASTER_PM.getName()})); Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName(), RoleEnums.MASTER_PM.getName()}));