|
@@ -395,17 +395,21 @@ public class AdminUserLogic {
|
|
if (CollectionUtil.isNotEmpty(deptList)) {
|
|
if (CollectionUtil.isNotEmpty(deptList)) {
|
|
// 找出部门下的商家
|
|
// 找出部门下的商家
|
|
for (String deptId : deptList) {
|
|
for (String deptId : deptList) {
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ // 遍历部门递归找出子部门
|
|
|
|
+ this.querySubDeptId(deptId, deptIdList);
|
|
|
|
+ deptIdList.add(deptId);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ for (String deptss : deptIdList) {
|
|
final List<AdminDeptWebsit> adminDeptWebsits = adminDeptWebsitService.lambdaQuery()
|
|
final List<AdminDeptWebsit> adminDeptWebsits = adminDeptWebsitService.lambdaQuery()
|
|
- .eq(AdminDeptWebsit::getAdminDeptId, deptId)
|
|
|
|
|
|
+ .eq(AdminDeptWebsit::getAdminDeptId, deptss)
|
|
.list();
|
|
.list();
|
|
final List<String> websitIds = adminDeptWebsits.stream()
|
|
final List<String> websitIds = adminDeptWebsits.stream()
|
|
.map(AdminDeptWebsit::getWebsitId)
|
|
.map(AdminDeptWebsit::getWebsitId)
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
websitIdList.addAll(websitIds);
|
|
websitIdList.addAll(websitIds);
|
|
-
|
|
|
|
- // 遍历部门递归找出子部门
|
|
|
|
- this.querySubDeptId(deptId, deptIdList);
|
|
|
|
- deptIdList.add(deptId);
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|