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 309855c..b7fcdb3 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
@@ -91,26 +91,26 @@ public class UISettingsController {
 		if(!StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)){
 			//包括envCode、groupCode条件
 			uisettingsList = uisettingsDao.findByEnvCodeAndGroupCodeAndUserid(envCode,groupCode,userService.getCurrentUserId());
-			if(null==uisettingsList){ //用户未设置则查找默认的设置
+			if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
 				uisettingsDefaultList = uisettingsDefaultDao.findByEnvCodeAndGroupCode(envCode,groupCode);
 			}
 		}else if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){
 			uisettingsList = uisettingsDao.findByUserid(userService.getCurrentUserId());
-			if(null==uisettingsList){ //用户未设置则查找默认的设置
+			if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
 				uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll();
 			}
 		}else{
 			if (!StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)) {
 				//envCode条件s
 				uisettingsList = uisettingsDao.findByEnvCodeAndUserid(envCode,userService.getCurrentUserId());
-				if(null==uisettingsList){ //用户未设置则查找默认的设置
+				if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
 					uisettingsDefaultList = uisettingsDefaultDao.findByEnvCode(envCode);
 				}
 			}
 			if (StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)) {
 				//groupCode条件
 				uisettingsList = uisettingsDao.findByGroupCodeAndUserid(groupCode,userService.getCurrentUserId());
-				if(null==uisettingsList){ //用户未设置则查找默认的设置
+				if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
 					uisettingsDefaultList = uisettingsDefaultDao.findByGroupCode(groupCode);
 				}
 			}