|
@@ -446,7 +446,7 @@ public class BizQuickDayworkController extends BaseController {
|
|
|
l.setNextProcess(l.getNextProcesses().isEmpty() ? null : l.getNextProcesses().get(0));
|
|
|
|
|
|
l.setWorkshopId(workshops.stream().filter(v -> v.getId().equals(l.getWorkshopId())).findFirst().orElse(new BizWorkshop()).getId());
|
|
|
- List<SysDept> nextDept = depts.stream().filter(e -> allProcesses.stream().filter(v -> l.getNextProcesses().stream().anyMatch(n -> v.getProcessId().equals(n.getId()))).anyMatch(v -> e.getDeptId().equals(v.getDeptId()))
|
|
|
+ List<SysDept> nextDept = depts.stream().filter(e -> "170000".equals(e.getDeptCode()) || allProcesses.stream().filter(v -> l.getNextProcesses().stream().anyMatch(n -> v.getProcessId().equals(n.getId()))).anyMatch(v -> e.getDeptId().equals(v.getDeptId()))
|
|
|
).collect(Collectors.toList());
|
|
|
workshops.forEach(e -> {
|
|
|
if (e.getDepts() == null) {
|