Merge branch 'master' into docker_package
This commit is contained in:
commit
120e5cb13a
|
@ -258,6 +258,10 @@ public class TAbilityApplicationController {
|
|||
return sysDeptDTO.getName();
|
||||
}
|
||||
}));
|
||||
tAbilityApplicationV2DTO.setEnded(re.keySet().stream().map(index -> {
|
||||
List<Map<String, Object>> index_ = re.get(index);
|
||||
return index_.stream().map(temp -> !(Boolean) temp.get("ended")).findAny().orElse(Boolean.FALSE); // 存在未完成流程
|
||||
}).filter(index -> index).findAny().orElse(Boolean.FALSE));
|
||||
tAbilityApplicationV2DTO.setResourceApplication(re);
|
||||
return new Result<TAbilityApplicationV2DTO>().ok(tAbilityApplicationV2DTO);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue