From 77b86882912e9e39b7c31fc651da31f3912253b0 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Wed, 19 Dec 2018 16:45:28 +0800
Subject: [PATCH] =?UTF-8?q?list=E4=B8=AD=E6=B8=85=E9=99=A4null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminapi/controller/settings/UISettingsController.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
index 51a90a3..58a8ebe 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
+++ b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -135,7 +136,7 @@ public class UISettingsController {
 				uisettingsListDto.add(defualtUiSettingsMap.get(groupCode));
 			}
 		}
-		
+		uisettingsListDto.remove(null);
 		return ResponseDto.success(uisettingsListDto);
 	}