From 01093fec7a56a8aba8c856c43d311fd3998a2426 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Mon, 5 Nov 2018 10:59:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminapi/controller/settings/UISettingsController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 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 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);
 		}