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 save(Uisettings uisettings); Uisettings findById(String id); + + List findByUserid(String userid); } \ No newline at end of file