From fc691092cf235beac600d7a7dbd3ab80b926667d Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Tue, 18 Dec 2018 16:28:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminapi/controller/settings/UISettingsController.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 b89c6b5..aa49202 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
@@ -123,9 +123,11 @@ public class UISettingsController {
 				defualtUiSettingsMap.remove(u.getGroupCode());
 			}
 		}
-		for(String key : defualtUiSettingsMap.keySet()){
-			uisettingsListDto.add(defualtUiSettingsMap.get(key));
+		
+		if(null!=defualtUiSettingsMap && defualtUiSettingsMap.size()>0){
+			uisettingsListDto.addAll(defualtUiSettingsMap.values());
 		}
+		
 		return ResponseDto.success(uisettingsListDto);
 	}