From 856354f0198e26efbf173d68eb39ab86d0520064 Mon Sep 17 00:00:00 2001 From: fanghongchao <601470458@qq.com> Date: Thu, 13 Dec 2018 15:49:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/settings/UISettingsController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 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) 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); } }