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 53b95ce..f2581b5 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
@@ -58,10 +58,12 @@ public class UISettingsController {
 		if (envCode!=null) {
 			//envCode条件
 			uisettingsList = uisettingsDao.findByEnvCode(envCode);
-		}else if (groupCode!=null) {
+		}
+		if (groupCode!=null) {
 			//groupCode条件
 			uisettingsList = uisettingsDao.findByGroupCode(groupCode);
-		}else {
+		}
+		if(envCode!=null && groupCode!=null){
 			//包括envCode、groupCode条件
 			uisettingsList = uisettingsDao.findByEnvCodeAndGroupCode(envCode,groupCode);
 		}