Browse Source

账户中心ip企业申请bu修复

zhaohongpeng 7 years ago
parent
commit
056c350a35

+ 1 - 1
src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -180,7 +180,7 @@ public class SecurityController {
 	@ResponseBody
 	public ModelMap updatePassWord(HttpServletRequest request, HttpServletResponse response, String returnUrl) throws IOException {
 		request.getSession().setAttribute(SSOConfig.SSOReferer, returnUrl );
-		SSOHelper.clearLogin(request, response);
+		//SSOHelper.clearLogin(request, response);
 		String updatePasswordUrl = SSOHelper.getUpdatePasswordUrl(request, returnUrl);
 		ModelMap map = new ModelMap("content", updatePasswordUrl);
 		return map;

+ 7 - 1
src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2c.common.account.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserBaseInfoDao;
@@ -162,7 +163,10 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		userView.setMobile(user.getUserTel());
 		userView.setEmail(user.getUserEmail());
 		userView.setIdCard(user.getUserIdcode());
-		userView.setImId(user.getUserIMId().toString());
+		Long imid = user.getUserIMId();
+		if (imid != null) {
+			userView.setImId(imid.toString());
+		}
 		//封装注册企业信息;
 		detail.setSpaceName(enterprise.getName());
 		detail.setCorporation(enterprise.getLawPerson());
@@ -187,6 +191,8 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 
 		String result = null;
 		try {
+			JSONObject data = JSON.parseObject(JSON.toJSONString(detail));
+			String userSpa = data.toJSONString();
 			AccountUtils.register(detail);
 		} catch (Exception e) {
 			return new ResultMap(CodeType.SYSTEM_ERROR, "账户中心异常,注册失败");

+ 1 - 0
src/main/webapp/WEB-INF/spring/webmvc.xml

@@ -107,6 +107,7 @@
 			<mvc:exclude-mapping path="/search/**" />
 			<mvc:exclude-mapping path="/commonSearch/**" />
 			<mvc:exclude-mapping path="/help" />
+			<mvc:exclude-mapping path="/base/enterprise/**" />
 			<mvc:exclude-mapping path="/trade/help/api/**" />
 			<mvc:exclude-mapping path="/recommendation/**" />
 			<mvc:exclude-mapping path="/news"/>