|
@@ -272,7 +272,7 @@ public class AdmSystemController {
|
|
|
admSystem.setBuildingFloorInfoList(buildingFloorInfoList);
|
|
|
}
|
|
|
});
|
|
|
- syses.setContent(admSystemList);
|
|
|
+ syses.setContent(CollUtil.isEmpty(admSystemList) ? new ArrayList<>(1) : admSystemList);
|
|
|
}
|
|
|
}else{
|
|
|
QueryCriteria rwdQueryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(request);
|
|
@@ -281,7 +281,7 @@ public class AdmSystemController {
|
|
|
return AdmResponse.failure("请求参数错误");
|
|
|
}
|
|
|
criteria.put("objType", AdmSystem.OBJ_TYPE);
|
|
|
- List<AdmSystem> admSystemList = null;
|
|
|
+ List<AdmSystem> admSystemList = new ArrayList<>();
|
|
|
if (StrUtil.isAllNotEmpty(buildingId, floorId)) {
|
|
|
if(!"1".equals(floorId)){
|
|
|
//case two 明确建筑、明确楼层的 系统
|