|
@@ -369,7 +369,9 @@ public class WmStatisticsServiceImpl implements WmStatisticsService {
|
|
// 根据父企业名称查询dept
|
|
// 根据父企业名称查询dept
|
|
List<SysDept> parentDepts = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getName, parentDeptName));
|
|
List<SysDept> parentDepts = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getName, parentDeptName));
|
|
// 根据子企业名称查询dept
|
|
// 根据子企业名称查询dept
|
|
- List<SysDept> subDepts = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().in(SysDept::getName, subDeptNames));
|
|
|
|
|
|
+ List<SysDept> subDepts = sysDeptService.listAllDept().stream()
|
|
|
|
+ .filter(sysDept -> subDeptNames.contains(sysDept.getName()))
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
|
if (CollectionUtil.isNotEmpty(parentDepts) && CollectionUtil.isNotEmpty(subDepts)) {
|
|
if (CollectionUtil.isNotEmpty(parentDepts) && CollectionUtil.isNotEmpty(subDepts)) {
|
|
Integer parentDeptId = parentDepts.get(0).getDeptId();
|
|
Integer parentDeptId = parentDepts.get(0).getDeptId();
|