|
@@ -297,7 +297,9 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public CommonResult<List<ObjectDigital>> querySpaceListByRoomFuncType(RequestData requestData) {
|
|
public CommonResult<List<ObjectDigital>> querySpaceListByRoomFuncType(RequestData requestData) {
|
|
- // 1.根据空间功能类型查询其下级空间功能类型
|
|
|
|
|
|
+ // 1.计算分页参数
|
|
|
|
+ computePageParam(requestData);
|
|
|
|
+ // 2.根据空间功能类型查询其下级空间功能类型
|
|
List<CodeTableData> codeTableDatas = CodeTableDataFacade
|
|
List<CodeTableData> codeTableDatas = CodeTableDataFacade
|
|
.queryCodeTableDatasByParentCode(AppContext.getContext().getGroupCode(),
|
|
.queryCodeTableDatasByParentCode(AppContext.getContext().getGroupCode(),
|
|
AppContext.getContext().getProjectId(),
|
|
AppContext.getContext().getProjectId(),
|
|
@@ -310,6 +312,7 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
|
|
if (CollUtil.isEmpty(codeTableDatas)){
|
|
if (CollUtil.isEmpty(codeTableDatas)){
|
|
return ResultHelper.multi(new ArrayList<>(),0L);
|
|
return ResultHelper.multi(new ArrayList<>(),0L);
|
|
}
|
|
}
|
|
|
|
+ // 3.根据分页参数及空间功能类型code数组查询对象
|
|
Set<String> codes = codeTableDatas.stream()
|
|
Set<String> codes = codeTableDatas.stream()
|
|
.map(CodeTableData::getCode)
|
|
.map(CodeTableData::getCode)
|
|
.collect(Collectors.toSet());
|
|
.collect(Collectors.toSet());
|