已有卡状态未传但检查不对

ie-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java

@@ -69,10 +69,14 @@ public class SysRegisterService
             if(StringUtils.isNotBlank(username)) { // 卡注册
                 DzCards exist = cardsService.selectDzCardsByCardNo(username);
                 if (StringUtils.isNull(exist)) {
-                    return "卡号不正确";
+                    return "卡号密码不正确";
+                }
+                if(StringUtils.isBlank(password) || !password.equals(exist.getPassword())) {
+                    return "卡号密码不正确";
                 }
                 upCard = new DzCards();
                 upCard.setCardId(exist.getCardId());
+                upCard.setStatus(exist.getStatus());
             } else {
                 username = mobile;
                 password = "123456";
@@ -90,6 +94,7 @@ public class SysRegisterService
             username = exist.getCardNo();
             upCard = new DzCards();
             upCard.setCardId(exist.getCardId());
+            upCard.setStatus(exist.getStatus());
             upUser.setUserId(loginUser.getUserId());
         }
         upUser.setUserName(username);