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);
 	}