|
@@ -58,6 +58,8 @@ public class EmsModelServiceImpl implements EmsModelService {
|
|
|
private EmsDeviceFunctionMapper emsDeviceFunctionMapper;
|
|
private EmsDeviceFunctionMapper emsDeviceFunctionMapper;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private DmpProductMapper dmpProductMapper;
|
|
private DmpProductMapper dmpProductMapper;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private BaseSpaceServiceImpl baseSpaceService;
|
|
|
|
|
|
|
|
private static final int SPACE_TYPE_PROJECT = 1;
|
|
private static final int SPACE_TYPE_PROJECT = 1;
|
|
|
private static final int SPACE_TYPE_REGION = 2;
|
|
private static final int SPACE_TYPE_REGION = 2;
|
|
@@ -787,8 +789,12 @@ public class EmsModelServiceImpl implements EmsModelService {
|
|
|
if (spaceId == null) {
|
|
if (spaceId == null) {
|
|
|
return Collections.emptyList();
|
|
return Collections.emptyList();
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ // 1. 授权空间
|
|
|
|
|
+ List<Long> spaceIds = baseSpaceService.getAuthorizedSpaceIds(spaceId);
|
|
|
|
|
+
|
|
|
List<BaseSpaceGateway> links = baseSpaceGatewayMapper.selectList(
|
|
List<BaseSpaceGateway> links = baseSpaceGatewayMapper.selectList(
|
|
|
- new LambdaQueryWrapper<BaseSpaceGateway>().eq(BaseSpaceGateway::getSpaceId, spaceId));
|
|
|
|
|
|
|
+ new LambdaQueryWrapper<BaseSpaceGateway>().in(BaseSpaceGateway::getSpaceId, spaceIds));
|
|
|
if (links == null || links.isEmpty()) {
|
|
if (links == null || links.isEmpty()) {
|
|
|
return Collections.emptyList();
|
|
return Collections.emptyList();
|
|
|
}
|
|
}
|