From a5d75cb517883cec0b698292c4491421da748677 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Wed, 12 Dec 2018 16:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7UI?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=B6=20=E6=B2=A1=E6=9C=89=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=20=E5=88=99=E6=9F=A5=E6=89=BE=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E6=89=80=E6=9C=89UI=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminapi/controller/settings/UISettingsController.java    | 4 +++-
 .../adminapi/domain/primary/dao/settings/UisettingsDao.java   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

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 eaf2a6c..3bd41ea 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
@@ -83,9 +83,11 @@ public class UISettingsController {
 		if(!StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)){
 			//包括envCode、groupCode条件
 			uisettingsList = uisettingsDao.findByEnvCodeAndGroupCodeAndUserid(envCode,groupCode,userService.getCurrentUserId());
+		}else if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){
+			uisettingsList = uisettingsDao.findByUserid(userService.getCurrentUserId());
 		}else{
 			if (!StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)) {
-				//envCode条件
+				//envCode条件s
 				uisettingsList = uisettingsDao.findByEnvCodeAndUserid(envCode,userService.getCurrentUserId());
 			}
 			if (StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)) {
diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/primary/dao/settings/UisettingsDao.java b/src/main/java/com/gzzn/omms/adminapi/domain/primary/dao/settings/UisettingsDao.java
index 3ccf158..05113a9 100644
--- a/src/main/java/com/gzzn/omms/adminapi/domain/primary/dao/settings/UisettingsDao.java
+++ b/src/main/java/com/gzzn/omms/adminapi/domain/primary/dao/settings/UisettingsDao.java
@@ -30,4 +30,6 @@ public interface UisettingsDao extends CrudRepository<Uisettings,String>{
 	Uisettings save(Uisettings uisettings);
 
 	Uisettings findById(String id);
+
+	List<Uisettings> findByUserid(String userid);
 }
\ No newline at end of file