|
|
@ -205,13 +205,25 @@ public class ServiceEC {
|
|
|
|
|
|
|
|
|
|
|
|
return weaResultMsg.fail("" + SystemEnv.getHtmlLabelName(10004764, ThreadVarLanguage.getLang()) + "," + SystemEnv.getHtmlLabelName(504523, ThreadVarLanguage.getLang()) + "").toString();
|
|
|
|
return weaResultMsg.fail("" + SystemEnv.getHtmlLabelName(10004764, ThreadVarLanguage.getLang()) + "," + SystemEnv.getHtmlLabelName(504523, ThreadVarLanguage.getLang()) + "").toString();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
User user = null;
|
|
|
|
|
|
|
|
String authCode = paramHttpServletRequest.getParameter("authCode");
|
|
|
|
String authCode = paramHttpServletRequest.getParameter("authCode");
|
|
|
|
if (StringUtils.isNotEmpty(authCode)) {
|
|
|
|
User user = HrmUserVarify.getUser(paramHttpServletRequest, paramHttpServletResponse);
|
|
|
|
user = ssoLoginByAuthCode(paramHttpServletRequest);
|
|
|
|
if (user == null) {
|
|
|
|
} else {
|
|
|
|
logger.info("ServiceEC user is null");
|
|
|
|
user = HrmUserVarify.getUser(paramHttpServletRequest, paramHttpServletResponse);
|
|
|
|
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();
|
|
|
|
Map map = EMManager.getEMData();
|
|
|
|
String str = (String) map.get("em_url");
|
|
|
|
String str = (String) map.get("em_url");
|
|
|
|
if (user != null) {
|
|
|
|
if (user != null) {
|
|
|
|