wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rollback mock

Browse Source
This commit is contained in:
陈维伟 2023-10-07 19:25:54 +08:00
parent 77831a46da
commit 5c1b8a7d78
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tyr-server/src/main/java/cn/axzo/tyr/server/controller/dataPermission/DataPermissionController.java
View File

@ -39,33 +39,30 @@ public class DataPermissionController implements DataPermissionApi {
.isReadable(false)
.isUpdatable(false)
.build();
// TODO mock
result.setIsReadable(true);
result.setIsUpdatable(true);
List<BpmnHistoricTaskInstanceVO> taskListFlatByProcessInstanceId = RpcExternalUtil.rpcProcessor(() -> processTaskApi.getTaskListFlatByProcessInstanceId(req.getProcessInstanceId(), req.getWorkspaceId()),"根据流程id查询审核任务",req);
// 获取流程实例信息,获取流程发起人身份id
BpmnProcessInstanceQueryDTO getProcessInstanceReq = new BpmnProcessInstanceQueryDTO();
getProcessInstanceReq.setProcessInstanceId(req.getProcessInstanceId());
getProcessInstanceReq.setTenantId(req.getWorkspaceId());
getProcessInstanceReq.setHasVariable(true);
BpmnProcessInstanceVO processInstanceVO = RpcExternalUtil.rpcProcessor(() -> processInstanceApi.getProcessInstanceVO(getProcessInstanceReq), "根据流程id查询流程实例,获取流程发起人身份id", getProcessInstanceReq);
String starterIdentityId = "";
if (processInstanceVO != null && processInstanceVO.getInitiator() != null && StringUtils.isNotBlank(processInstanceVO.getInitiator().getAssignee())) {
starterIdentityId = processInstanceVO.getInitiator().getAssignee();
}
// 判断当前用户是否在审核任务中
if (CollectionUtils.isEmpty(taskListFlatByProcessInstanceId) && StringUtils.isBlank(starterIdentityId)) {
return ApiResult.ok(result);
}
// 如果当前用户在流程任务中则允许查看
if (String.valueOf(req.getIdentityId()).equals(starterIdentityId) ||
taskListFlatByProcessInstanceId.stream().map(BpmnHistoricTaskInstanceVO::getAssignee).collect(Collectors.toList()).contains(String.valueOf(req.getIdentityId()))) {
result.setIsReadable(true);
}
// 如果当前用户在未结束的审核任务中则允许编辑
if (taskListFlatByProcessInstanceId.stream().filter(e -> e.getEndTime() == null).map(BpmnHistoricTaskInstanceVO::getAssignee).collect(Collectors.toList()).contains(String.valueOf(req.getIdentityId()))) {
result.setIsUpdatable(true);
}
return ApiResult.ok(result);
// List<BpmnHistoricTaskInstanceVO> taskListFlatByProcessInstanceId = RpcExternalUtil.rpcProcessor(() -> processTaskApi.getTaskListFlatByProcessInstanceId(req.getProcessInstanceId(), req.getWorkspaceId()),"根据流程id查询审核任务",req);
// // 获取流程实例信息,获取流程发起人身份id
// BpmnProcessInstanceQueryDTO getProcessInstanceReq = new BpmnProcessInstanceQueryDTO();
// getProcessInstanceReq.setProcessInstanceId(req.getProcessInstanceId());
// getProcessInstanceReq.setTenantId(req.getWorkspaceId());
// BpmnProcessInstanceVO processInstanceVO = RpcExternalUtil.rpcProcessor(() -> processInstanceApi.getProcessInstanceVO(getProcessInstanceReq), "根据流程id查询流程实例,获取流程发起人身份id", getProcessInstanceReq);
// String starterIdentityId = "";
// if (processInstanceVO != null && processInstanceVO.getInitiator() != null && StringUtils.isNotBlank(processInstanceVO.getInitiator().getAssignee())) {
// starterIdentityId = processInstanceVO.getInitiator().getAssignee();
// }
// // 判断当前用户是否在审核任务中
// if (CollectionUtils.isEmpty(taskListFlatByProcessInstanceId) && StringUtils.isBlank(starterIdentityId)) {
// return ApiResult.ok(result);
// }
// // 如果当前用户在流程任务中则允许查看
// if (String.valueOf(req.getIdentityId()).equals(starterIdentityId) ||
// taskListFlatByProcessInstanceId.stream().map(BpmnHistoricTaskInstanceVO::getAssignee).collect(Collectors.toList()).contains(String.valueOf(req.getIdentityId()))) {
// result.setIsReadable(true);
// }
// // 如果当前用户在未结束的审核任务中则允许编辑
// if (taskListFlatByProcessInstanceId.stream().filter(e -> e.getEndTime() == null).map(BpmnHistoricTaskInstanceVO::getAssignee).collect(Collectors.toList()).contains(String.valueOf(req.getIdentityId()))) {
// result.setIsUpdatable(true);
// }
// return ApiResult.ok(result);
}
}