Merge branch 'master' of git@git.int.it2000.com.cn:airport-chengdu/admin-api.git
This commit is contained in:
@@ -55,13 +55,15 @@ public class UISettingsController {
|
||||
@RequestParam(required=false) String groupCode)
|
||||
{
|
||||
List<Uisettings> uisettingsList = new ArrayList<Uisettings>();
|
||||
if (envCode!=null) {
|
||||
if (envCode!=null && envCode!="") {
|
||||
//envCode条件
|
||||
uisettingsList = uisettingsDao.findByEnvCode(envCode);
|
||||
}else if (groupCode!=null) {
|
||||
}
|
||||
if (groupCode!=null && groupCode!="") {
|
||||
//groupCode条件
|
||||
uisettingsList = uisettingsDao.findByGroupCode(groupCode);
|
||||
}else {
|
||||
}
|
||||
if((envCode!=null && envCode!="") && (groupCode!=null && groupCode!="")){
|
||||
//包括envCode、groupCode条件
|
||||
uisettingsList = uisettingsDao.findByEnvCodeAndGroupCode(envCode,groupCode);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user