From 3b08ba8bbe81c5615c9be6090e3092598aa85f35 Mon Sep 17 00:00:00 2001 From: shentao999 Date: Tue, 30 Apr 2019 22:51:51 +0800 Subject: Fix no name language option bug Change-Id: I0bfc185ea41324d040ffa23c831bbbaa8f51ef3c Issue-ID: PORTAL-566 Signed-off-by: shentao999 --- .../portal/service/LanguageServiceImpl.java | 38 +++++++++++++++------- 1 file changed, 27 insertions(+), 11 deletions(-) (limited to 'ecomp-portal-BE-common/src/main/java/org') diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/LanguageServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/LanguageServiceImpl.java index 13d7097b..1aa12b21 100644 --- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/LanguageServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/LanguageServiceImpl.java @@ -16,6 +16,9 @@ package org.onap.portalapp.portal.service; import com.alibaba.fastjson.JSONObject; + +import antlr.StringUtils; + import org.onap.portalapp.portal.domain.EPUser; import org.onap.portalapp.portal.domain.Language; import org.onap.portalsdk.core.service.DataAccessService; @@ -53,18 +56,31 @@ public class LanguageServiceImpl implements LanguageService { public JSONObject getUserLanguage(String loginId) { // get language_id from fn_user by loginId JSONObject result = new com.alibaba.fastjson.JSONObject(); - HashMap params = new HashMap(); - params.put("login_id",loginId); - - EPUser user = (EPUser) dataAccessService.executeNamedQuery("getEPUserByLoginId",params,new HashMap()).get(0); - int languageId = user.getLanguageId(); - HashMap params1 = new HashMap(); - params1.put("language_id", String.valueOf(languageId)); - Language language = (Language) dataAccessService.executeNamedQuery("queryLanguageByLanguageId",params1,new HashMap()); - result.put("languageId",languageId); - result.put("languageName",language.getLanguageName()); - result.put("languageAlias",language.getLanguageAlias()); + HashMap getUserParams = new HashMap(); + getUserParams.put("login_id", loginId); + List userList= null; + + try { + userList = dataAccessService.executeNamedQuery("getEPUserByLoginId", getUserParams, new HashMap()); + if (userList != null && userList.size() > 0) { + EPUser user = userList.get(0); + int languageId = user.getLanguageId(); + result.put("languageId", languageId); + + // get language name and alias from fn_language by languageId + HashMap getLangParams = new HashMap(); + getLangParams.put("language_id", String.valueOf(languageId)); + List languageList = null; + languageList = dataAccessService.executeNamedQuery("queryLanguageByLanguageId", getLangParams, new HashMap()); + if (languageList != null && languageList.size() > 0) { + result.put("languageName", languageList.get(0).getLanguageName()); + result.put("languageAlias", languageList.get(0).getLanguageAlias()); + } + } + } catch (Exception e) { + e.printStackTrace(); + } return result; } } -- cgit 1.2.3-korg