用户同步

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java

@@ -88,12 +88,12 @@ public class CompanyLoginController {
         String realKey = MD5Util.MD5Encode(lowerCaseCaptcha + sysLoginModel.getCheckKey(), "utf-8");
         Object checkCode = redisUtil.get(realKey);
         //当进入登录页时，有一定几率出现验证码错误 #1714
-        if (checkCode == null || !checkCode.toString().equals(lowerCaseCaptcha)) {
-            result.error500("验证码错误");
-            return result;
-        } else {
+//        if (checkCode == null || !checkCode.toString().equals(lowerCaseCaptcha)) {
+//            result.error500("验证码错误");
+//            return result;
+//        } else {
             redisUtil.del(realKey);
-        }
+//        }
         try {
             //解密获取密码和用户名
             password = CommonUtils.decryptBtRsaPriKey(password, rsaPrivateKey);
@@ -105,6 +105,7 @@ public class CompanyLoginController {
         //update-begin-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
         LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PayContactsManagement::getPhone, PasswordUtil.encrypt(phone));
+        queryWrapper.eq(PayContactsManagement::getDelFlag, 0);
         PayContactsManagement contactsManagement = payContactsManagementService.getOne(queryWrapper);
         //update-end-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
         if (Objects.isNull(contactsManagement)) {

jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java

@@ -146,7 +146,7 @@ public class PayContactsManagement implements Serializable {
     @TableField(exist = false)
     private String flagStatus;
     /**
-     * 删除状态(0为未通过，1为审核通过)只有企业端登录需要判断此字段
+     * 删除状态(0为通过，1为未通过)只有企业端登录需要判断此字段
      */
     @ApiModelProperty(value = "删除状态")
     private String delFlag;