From 62520477e6ac5fc8ccce28fdb69ec26246a4a37b Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 02 Jul 2018 11:27:14 +0800
Subject: [PATCH] 优化 大屏数据排名接口
---
src/main/java/com/moral/controller/ScreenController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index d02d6d6..b3d6354 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -610,10 +610,10 @@
}
}
}
- if(rtdLayout.getDefaultMonitorItems().size() == 0 ) {
+ if(rtdLayout!=null && rtdLayout.getDefaultMonitorItems().size() == 0 ) {
rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems());
}
- return new ResultBean(rtdLayout);
+ return new ResultBean(rtdLayout == null? new RealTimeDeviceLayout():rtdLayout);
}
@GetMapping("report_avg_data")
--
Gitblit v1.8.0