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 f2581b5..14ab5ca 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
@@ -55,15 +55,15 @@ public class UISettingsController {
 		   @RequestParam(required=false) String groupCode)
 	{
 		List<Uisettings> uisettingsList = new ArrayList<Uisettings>();
-		if (envCode!=null) {
+		if (envCode!=null && envCode!="") {
 			//envCode条件
 			uisettingsList = uisettingsDao.findByEnvCode(envCode);
 		}
-		if (groupCode!=null) {
+		if (groupCode!=null && groupCode!="") {
 			//groupCode条件
 			uisettingsList = uisettingsDao.findByGroupCode(groupCode);
 		}
-		if(envCode!=null && groupCode!=null){
+		if((envCode!=null && envCode!="") && (groupCode!=null && groupCode!="")){
 			//包括envCode、groupCode条件
 			uisettingsList = uisettingsDao.findByEnvCodeAndGroupCode(envCode,groupCode);
 		}