|
|
@ -230,10 +230,13 @@ public class MainWorkBenchServiceImpl extends BaseServiceImpl<MainWorkBenchMappe |
|
|
|
workBench.setMainWorkBenchEntityList(routes); |
|
|
|
workBench.setMainWorkBenchEntityList(routes); |
|
|
|
}else if(CollectionUtil.isEmpty(routes.stream().filter(o->StringUtils.isNotEmpty(o.getRefDept())).collect(Collectors.toList()))){ |
|
|
|
}else if(CollectionUtil.isEmpty(routes.stream().filter(o->StringUtils.isNotEmpty(o.getRefDept())).collect(Collectors.toList()))){ |
|
|
|
// 设置结果集
|
|
|
|
// 设置结果集
|
|
|
|
workBench.setMainWorkBenchEntityList(routes.stream().filter(o->o.getAscriptionUser().contains(user)).collect(Collectors.toList())); |
|
|
|
workBench.setMainWorkBenchEntityList(routes.stream().filter(o->StringUtils.isNotEmpty(o.getAscriptionUser()) && o.getAscriptionUser().contains(user)).collect(Collectors.toList())); |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
// 设置结果集
|
|
|
|
// 设置结果集
|
|
|
|
workBench.setMainWorkBenchEntityList(routes.stream().filter(o->{ |
|
|
|
workBench.setMainWorkBenchEntityList(routes.stream().filter(o->{ |
|
|
|
|
|
|
|
if(StringUtils.isEmpty(o.getRefDept())){ |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
for(String deptId: depts) { |
|
|
|
for(String deptId: depts) { |
|
|
|
if (o.getRefDept().contains(deptId)) { |
|
|
|
if (o.getRefDept().contains(deptId)) { |
|
|
|
return true; |
|
|
|
return true; |
|
|
|