登陆接口

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

@@ -193,8 +193,8 @@ public class LoginController extends WebBaseController{
         //判断是否存在random
 		AES aes = SecureUtil.aes(LOGIN_KEY.getBytes());
 		String o = aes.decryptStr(random);
-		if(o == null){
-			logger.info("解密异常");
+        if (o == null || StringUtils.isBlank(wxEnterpriseId)) {
+            logger.info("解密异常");
 			ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false,false));
 			return model;
 		}
@@ -207,16 +207,8 @@ public class LoginController extends WebBaseController{
 			ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false,false));
 			return model;
 		}
-        WxEnterpriseDTO detailDTO = null;
-        if (StringUtils.isNotBlank(wxEnterpriseId)) {
-            detailDTO = enterpriseDTOList.stream().filter(dto -> dto.getWxEnterpriseId().equals(wxEnterpriseId)).findFirst().orElse(null);
-        } else if (enterpriseDTOList.size() > 1) {
-            detailDTO = enterpriseDTOList.get(0);
-        } else {
-            logger.info("登陆选择多个企业：{}", JSONObject.toJSONString(enterpriseDTOList));
-            ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/login", false, false));
-            return model;
-        }
+
+        WxEnterpriseDTO detailDTO = enterpriseDTOList.stream().filter(dto -> dto.getWxEnterpriseId().equals(wxEnterpriseId)).findFirst().orElse(null);
 
         if (null == detailDTO) {
             logger.info("登录失败，不存在对应企业:{}", o);