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

Merge branch 'master' of git@git.int.it2000.com.cn:airport-chengdu/admin-api.git

Browse Source
This commit is contained in:
zhouxiunai
2018-11-05 11:32:54 +08:00
parent 9eac30a7dd 01093fec7a
commit b2ccd39148
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
+5 -3
View File
@@ -55,13 +55,15 @@ public class UISettingsController {
@RequestParam(required=false) String groupCode) @RequestParam(required=false) String groupCode)
{ {
List<Uisettings> uisettingsList = new ArrayList<Uisettings>(); List<Uisettings> uisettingsList = new ArrayList<Uisettings>();
if (envCode!=null) { if (envCode!=null && envCode!="") {
//envCode条件 //envCode条件
uisettingsList = uisettingsDao.findByEnvCode(envCode); uisettingsList = uisettingsDao.findByEnvCode(envCode);
}else if (groupCode!=null) { }
if (groupCode!=null && groupCode!="") {
//groupCode条件 //groupCode条件
uisettingsList = uisettingsDao.findByGroupCode(groupCode); uisettingsList = uisettingsDao.findByGroupCode(groupCode);
}else { }
if((envCode!=null && envCode!="") && (groupCode!=null && groupCode!="")){
//包括envCode、groupCode条件 //包括envCode、groupCode条件
uisettingsList = uisettingsDao.findByEnvCodeAndGroupCode(envCode,groupCode); uisettingsList = uisettingsDao.findByEnvCodeAndGroupCode(envCode,groupCode);
} }