windy/admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

判断条件修改

Browse Source
This commit is contained in:
fanghongchao
2018-12-13 15:49:56 +08:00
parent d80396d272
commit 856354f019
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
+4 -4
View File
@@ -91,26 +91,26 @@ public class UISettingsController {
if(!StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)){ if(!StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)){
//包括envCode、groupCode条件 //包括envCode、groupCode条件
uisettingsList = uisettingsDao.findByEnvCodeAndGroupCodeAndUserid(envCode,groupCode,userService.getCurrentUserId()); uisettingsList = uisettingsDao.findByEnvCodeAndGroupCodeAndUserid(envCode,groupCode,userService.getCurrentUserId());
if(null==uisettingsList){ //用户未设置则查找默认的设置 if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
uisettingsDefaultList = uisettingsDefaultDao.findByEnvCodeAndGroupCode(envCode,groupCode); uisettingsDefaultList = uisettingsDefaultDao.findByEnvCodeAndGroupCode(envCode,groupCode);
} }
}else if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){ }else if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){
uisettingsList = uisettingsDao.findByUserid(userService.getCurrentUserId()); uisettingsList = uisettingsDao.findByUserid(userService.getCurrentUserId());
if(null==uisettingsList){ //用户未设置则查找默认的设置 if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll(); uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll();
} }
}else{ }else{
if (!StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)) { if (!StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)) {
//envCode条件s //envCode条件s
uisettingsList = uisettingsDao.findByEnvCodeAndUserid(envCode,userService.getCurrentUserId()); uisettingsList = uisettingsDao.findByEnvCodeAndUserid(envCode,userService.getCurrentUserId());
if(null==uisettingsList){ //用户未设置则查找默认的设置 if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
uisettingsDefaultList = uisettingsDefaultDao.findByEnvCode(envCode); uisettingsDefaultList = uisettingsDefaultDao.findByEnvCode(envCode);
} }
} }
if (StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)) { if (StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)) {
//groupCode条件 //groupCode条件
uisettingsList = uisettingsDao.findByGroupCodeAndUserid(groupCode,userService.getCurrentUserId()); uisettingsList = uisettingsDao.findByGroupCodeAndUserid(groupCode,userService.getCurrentUserId());
if(null==uisettingsList){ //用户未设置则查找默认的设置 if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
uisettingsDefaultList = uisettingsDefaultDao.findByGroupCode(groupCode); uisettingsDefaultList = uisettingsDefaultDao.findByGroupCode(groupCode);
} }
} }