From 687a0687ebad6cd1cfcb6a6017a99ec0458d1d1a Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 23 六月 2021 13:42:30 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index 42cd8e3..7254790 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -2070,7 +2070,7 @@
*/
@Override
public R getScreenEventList(ScreenEventListDTO eventListDTO) {
- if (!eventListDTO.getEventTypes().isEmpty()) {
+ if (eventListDTO.getEventTypes() != null && !eventListDTO.getEventTypes().isEmpty()) {
eventListDTO.getEventTypes().forEach(eventType -> {
if(eventType.equals(ScreenEventListDTO.eventType.xc)){
eventListDTO.setEventCategory(null);
--
Gitblit v1.7.1