|
@@ -70,11 +70,11 @@ public class WorkerComListLogic {
|
|
|
comListIds = worker.stream().map(WorkerComListWorker::getWorkerComListId).distinct().collect(Collectors.toList());
|
|
|
} else {
|
|
|
//以登录人为准
|
|
|
- List<WebsitUser> websitUsers = websitUserService.lambdaQuery()
|
|
|
- .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()),WebsitUser::getWebsitId, adminUser.getAdminWebsitIds())
|
|
|
- .isNotNull(WebsitUser::getWorkerNumber)
|
|
|
- .select(WebsitUser::getWorkerNumber).list();
|
|
|
- List<String> collect = websitUsers.stream().map(WebsitUser::getWebsitId).collect(Collectors.toList());
|
|
|
+ List<AdminWebsit> websitUsers = adminWebsitService.lambdaQuery()
|
|
|
+ .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()),AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
|
|
|
+ .select(AdminWebsit::getWebsitId)
|
|
|
+ .list();
|
|
|
+ List<String> collect = websitUsers.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
|
|
|
|
|
|
List<WorkerComListWebsit> websit = workerComListWebsitService.lambdaQuery()
|
|
|
.in(!CollectionUtils.isEmpty(collect),WorkerComListWebsit::getWebsitId,collect)
|