|
@@ -90,7 +90,8 @@ public class SysEnterpriseAreaServiceImpl extends ServiceImpl<SysEnterpriseAreaM
|
|
|
*/
|
|
|
@Override
|
|
|
public List<Long> listEntAreas(Collection<Long> deptId) {
|
|
|
- return this.list(Wrappers.<SysEnterpriseArea>lambdaQuery().in(SysEnterpriseArea::getEntId, deptId)).stream().map(SysEnterpriseArea::getAreaId).collect(Collectors.toList());
|
|
|
+ List<Long> collect = deptId.stream().sorted().collect(Collectors.toList());
|
|
|
+ return this.list(Wrappers.<SysEnterpriseArea>lambdaQuery().in(SysEnterpriseArea::getEntId, collect)).stream().map(SysEnterpriseArea::getAreaId).collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
|
|
@@ -102,7 +103,8 @@ public class SysEnterpriseAreaServiceImpl extends ServiceImpl<SysEnterpriseAreaM
|
|
|
*/
|
|
|
@Override
|
|
|
public Map<Long, List<Long>> listEntAreas1(Collection<Long> deptId) {
|
|
|
- return this.list(Wrappers.<SysEnterpriseArea>lambdaQuery().in(SysEnterpriseArea::getEntId, deptId)).stream().collect(Collectors.groupingBy(SysEnterpriseArea::getEntId, Collectors.mapping(SysEnterpriseArea::getAreaId, Collectors.toList())));
|
|
|
+ List<Long> collect = deptId.stream().sorted().collect(Collectors.toList());
|
|
|
+ return this.list(Wrappers.<SysEnterpriseArea>lambdaQuery().in(SysEnterpriseArea::getEntId, collect)).stream().collect(Collectors.groupingBy(SysEnterpriseArea::getEntId, Collectors.mapping(SysEnterpriseArea::getAreaId, Collectors.toList())));
|
|
|
}
|
|
|
|
|
|
/**
|