diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index bf65e845f..5a9df5b8f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -139,13 +139,13 @@ public class UserController { try { FjtUsers users = fjtUsersService.findById(userId); - if(users.getRole()==17 && type.equals("b")){ - CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); - response.sendRedirect("reqLoginPage"); - }else if(users.getRole()==12 && type.equals("bh")){ - CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); - response.sendRedirect("bhydLoginPage?code="+model.getCode()); - }else{ +// if(users.getRole()==17 && type.equals("b")){ +// CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); +// response.sendRedirect("reqLoginPage"); +// }else if(users.getRole()==12 && type.equals("bh")){ +// CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); +// response.sendRedirect("bhydLoginPage?code="+model.getCode()); +// }else{ List citys = userCityService.findSupportCityByUserId(userId); if(citys == null || citys.isEmpty()){ citys = Arrays.asList("ÉϺ£"); @@ -156,7 +156,7 @@ public class UserController { // citys = userCityService.findSupportCityByUserId(userId); // } model.setCitys(citys); - } +// } } catch (Exception e) { model.setCitys(new ArrayList()); } @@ -164,11 +164,11 @@ public class UserController { } else { CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); try { - if(type.equals("bh")){ - response.sendRedirect("bhydLoginPage?code="+model.getCode()); - }else{ +// if(type.equals("bh")){ +// response.sendRedirect("bhydLoginPage?code="+model.getCode()); +// }else{ response.sendRedirect("reqLoginPage"); - } +// } } catch (IOException e) { } @@ -384,7 +384,7 @@ public class UserController { return resultModel; } CookieUtils.setCookie("login_user_id", user.getId() + "", "/", 60 * 60 * 24 *7, response); - CookieUtils.setCookie("login_user_type", "bh", "/", 60 * 60 * 24 *7, response); + CookieUtils.setCookie("login_user_type", "b", "/", 60 * 60 * 24 *7, response); CookieUtils.setCookie("login_enterpriseuser_weixinid", weiXinId, "/", 60 * 60 * 24 *7, response); resultModel.setResult(Message.RESULT_SUCCESS); return resultModel; diff --git a/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl b/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl index 237b2b5f1..11b6bd390 100644 --- a/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl @@ -135,7 +135,7 @@ if(re.result == "fail"){ $.toast(re.msg); } else { - window.location.href = "reqCityChoicePage?type=bh"; + window.location.href = "reqCityChoicePage?type=b"; } },error:function (data, status) { $.toast("发送失败,请重试");