瀏覽代碼

Merge branch 'master-hotfix-210705' of googol/YY_BE_2 into master

孙珩宸 4 年之前
父節點
當前提交
f17de79cfe

+ 3 - 1
hnqz-visual/hnqz-daemon-quartz/src/main/java/com/qunzhixinxi/hnqz/daemon/quartz/service/impl/WmStatisticsServiceImpl.java

@@ -369,7 +369,9 @@ public class WmStatisticsServiceImpl implements WmStatisticsService {
 			// 根据父企业名称查询dept
 			List<SysDept> parentDepts = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getName, parentDeptName));
 			// 根据子企业名称查询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)) {
 				Integer parentDeptId = parentDepts.get(0).getDeptId();