|
@@ -1172,8 +1172,18 @@ public class KwsEnterpriseService {
|
|
|
return Collections.emptyList();
|
|
return Collections.emptyList();
|
|
|
}
|
|
}
|
|
|
kwsEnterprises = kwsEnterprises.stream().filter(item -> !entIds.contains(item.getId())).collect(Collectors.toList());
|
|
kwsEnterprises = kwsEnterprises.stream().filter(item -> !entIds.contains(item.getId())).collect(Collectors.toList());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ //求交集数据
|
|
|
|
|
+ List<Long> entIds = remoteSystemService.queryEntIdsByCode(accessSpecial, null);
|
|
|
|
|
+ List<Long> longList = kwsEnterprises.stream().map(KwsEnterprise::getId).distinct().collect(Collectors.toList());
|
|
|
|
|
+ List<Long> intersection = longList.stream()
|
|
|
|
|
+ .filter(entIds::contains)
|
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
+ kwsEnterprises = kwsEnterpriseDao.selectByKeys(intersection);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (kwsEnterprises.size() < 1) {
|
|
|
|
|
+ return Collections.emptyList();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
//过滤除了当前企业的其他企业
|
|
//过滤除了当前企业的其他企业
|
|
|
kwsEnterprises = kwsEnterprises.stream().filter(item -> !item.getId().equals(entId)).toList();
|
|
kwsEnterprises = kwsEnterprises.stream().filter(item -> !item.getId().equals(entId)).toList();
|
|
|
if (CollectionUtils.isEmpty(kwsEnterprises)) {
|
|
if (CollectionUtils.isEmpty(kwsEnterprises)) {
|