|
@@ -1215,10 +1215,12 @@ public class TaskController extends BladeController {
|
|
|
List<FixedFlowLink> query = jdbcTemplate.query("SELECT * FROM u_fixed_flow_link WHERE fixed_flow_id = ?", new Object[]{task.getFixedFlowId()}, new BeanPropertyRowMapper<>(FixedFlowLink.class));
|
|
|
//校验当前用户在第几流程
|
|
|
Integer sort = query.stream().collect(Collectors.toMap(l -> l.getFixedFlowLinkUser(), l -> l.getFixedFlowBranchSort())).get(AuthUtil.getUserId());
|
|
|
+ // 为空则代表是上报人,直接显示当前结果
|
|
|
if (sort == null){
|
|
|
- throw new ServiceException("未获取到当前用户在流程中的信息");
|
|
|
+ currentUserFlow = 2;
|
|
|
+ }else {
|
|
|
+ currentUserFlow = sort;
|
|
|
}
|
|
|
- currentUserFlow = sort;
|
|
|
|
|
|
Map<String, List<FixedFlowLink>> group = query.stream()
|
|
|
.collect(Collectors.groupingBy(obj -> obj.getFixedFlowLink() + "@@@" + obj.getFixedFlowLinkType(),
|