Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -556,7 +556,7 @@ public class LoginController extends WebBaseController {
      */
     @RequestMapping("/gic-login-check")
     @IgnoreLogin
-    public ModelAndView gicLogin(String code, String hbEnt) {
+    public ModelAndView gicLogin(String code, String hbEnt,String hbPage) {
         logger.info("gic登录clerkId={},hbEnt={}", code, hbEnt);
         PowerClerkDTO clerkDTO = this.userService.haobanLoginBack(code);
         if (clerkDTO == null) {
@@ -568,14 +568,19 @@ public class LoginController extends WebBaseController {
         String loginPhoneNumber = clerkDTO.getPhoneNumber();
         Map<String, String> retMap = new HashMap<>();
         retMap.put("wxEnterpriseId", hbEnt);
+        retMap.put("hbPage", hbPage) ;
         retMap.put("enterpriseId", gicEnterpriseId);
         retMap.put("phoneNumber", loginPhoneNumber);
         retMap.put("timestamp", System.currentTimeMillis()+"") ;
         String ret = JSONObject.toJSONString(retMap);
         AES aes = SecureUtil.aes(LOGIN_KEY.getBytes());
         String random = aes.encryptHex(ret);
+        String pageStr = "";
+        if(StringUtils.isNotBlank(hbPage)) {
+            pageStr += "&hbPage="+hbPage ;
+        }
         RedisUtil.setCache(random, 1,10L,TimeUnit.MINUTES);
-        ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/loginMore?random=" + random, false, false));
+        ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/loginMore?random=" + random+pageStr, false, false));
         return model;
     }