From 539a7077cbf638a5aa9ae5e46c17be96daba7d9b Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Mon, 02 Jul 2018 10:54:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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