From 70f550bb3414caef9a02f34a053ad9a69d9c663d Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 08 Mar 2022 13:27:04 +0800
Subject: [PATCH] 修改Organization_Layout查询接口返回数据
---
screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java | 2 +-
screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java | 3 ---
2 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java b/screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java
index a9ff956..e4d432d 100644
--- a/screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java
@@ -33,7 +33,7 @@
}
Map<String,Object> resultMap = organizationLayoutService.getLayoutByMac(parameters.get("mac").toString());
if (ObjectUtils.isEmpty(resultMap)){
- return null;
+ return ResultMessage.ok();
}
return ResultMessage.ok(resultMap);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java
index 019fc8e..feb5663 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java
@@ -52,9 +52,6 @@
wrapper_organizationLayout.eq("version_id",versionId);
wrapper_organizationLayout.eq("is_delete",Constants.NOT_DELETE);
List<OrganizationLayout> organizationLayouts = organizationLayoutMapper.selectList(wrapper_organizationLayout);
- if (ObjectUtils.isEmpty(organizationLayouts) || organizationLayouts.size()==0){
- return null;
- }
Map<String, Object> resultMap = new HashMap<>();
List<OrganizationLayout> chartSensorKeyList = new ArrayList<>();
List<OrganizationLayout> coreMonitorItemsList = new ArrayList<>();
--
Gitblit v1.8.0