日志4 - match22222123123123

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -644,12 +644,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         boolean havePasswordFlag=false;
         //密码是否正确
         boolean passwordRightFlag=false;
-        for (CustomerStaffDTO customerStaffDTO : customerStaffList) {
+        CustomerStaffDTO customerStaffDTO = customerStaffList.get(0);
+
         if (StringUtils.isNotBlank(customerStaffDTO.getPassword())) {
             havePasswordFlag = true;
-            }else{
-                logger.warn(String.format("当前用户:账户%s,客户Id%s下未设置密码.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId()));
-                continue;
         }
         long start2 = System.currentTimeMillis();
         if (PasswordUtils.matches(formDTO.getPassword(), customerStaffDTO.getPassword())) {
@@ -657,7 +655,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
             customerIdList.add(customerStaffDTO.getCustomerId());
         }
         logger.info("getMyOrgByAccountService PasswordUtils.matches cost:{}", System.currentTimeMillis() - start2);
-        }
+
         //根据手机号查出来所有用户,密码都为空,表明用户未激活账户,未设置密码
         if(!havePasswordFlag){
             logger.warn(String.format("当前账户（%s）下所有账户都未设置密码，请先使用验证码登录激活账户",formDTO.getUserAccount()));
@@ -670,7 +668,6 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         }
         logger.info("getMyOrgByAccountService checkpassword cost:{}",System.currentTimeMillis() - start);
         start = System.currentTimeMillis();
-        CustomerStaffDTO customerStaffDTO = customerStaffList.get(0);
         String tempKey = RedisKeys.getCustomerStaffTempKey(customerStaffDTO.getUserId());
         List<StaffOrgsResultDTO> redisTemp = (List<StaffOrgsResultDTO>)redisUtils.get(tempKey);
         if (redisTemp != null){