diff --git a/src/com/cloudstore/dev/api/service/ServiceEC.java b/src/com/cloudstore/dev/api/service/ServiceEC.java index b785744b..8a9f1cb5 100644 --- a/src/com/cloudstore/dev/api/service/ServiceEC.java +++ b/src/com/cloudstore/dev/api/service/ServiceEC.java @@ -205,13 +205,25 @@ public class ServiceEC { return weaResultMsg.fail("" + SystemEnv.getHtmlLabelName(10004764, ThreadVarLanguage.getLang()) + "," + SystemEnv.getHtmlLabelName(504523, ThreadVarLanguage.getLang()) + "").toString(); } - User user = null; + String authCode = paramHttpServletRequest.getParameter("authCode"); - if (StringUtils.isNotEmpty(authCode)) { - user = ssoLoginByAuthCode(paramHttpServletRequest); - } else { - user = HrmUserVarify.getUser(paramHttpServletRequest, paramHttpServletResponse); + User user = HrmUserVarify.getUser(paramHttpServletRequest, paramHttpServletResponse); + if (user == null) { + logger.info("ServiceEC user is null"); + logger.info("ServiceEC authCode:"+authCode); + if(StringUtils.isNotBlank(authCode)){ + user = ssoLoginByAuthCode(paramHttpServletRequest); + logger.info("ServiceEC user:"+user.getLoginid()); + } + }else{ + String userlogid = user.getLoginid(); + if(!userlogid.equals(authCode)){ + user = ssoLoginByAuthCode(paramHttpServletRequest); + logger.info("ServiceEC2 user:"+user.getLoginid()); + } + logger.info("ServiceEC user is not null"); } + Map map = EMManager.getEMData(); String str = (String) map.get("em_url"); if (user != null) {