分配且未激活的卡才可能绑定激活

ie-admin/src/main/java/com/ruoyi/web/controller/front/UserController.java

@@ -412,7 +412,7 @@ public class UserController extends BaseController {
 //            return AjaxResult.error("卡已使用");
 //        }
 
-        if(!CardDistributeStatus.Assign.getVal().equals(cards.getDistributeStatus()) && !CardStatus.Free.getVal().equals(cards.getStatus())) {
+        if(!CardDistributeStatus.Assign.getVal().equals(cards.getDistributeStatus()) || !CardStatus.Free.getVal().equals(cards.getStatus())) {
             return AjaxResult.error("无效卡");
         }
         if(null != cards.getAssignSchoolId()) {

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

@@ -212,7 +212,7 @@ public class SysRegisterService
             card.setClassId(register.getClassId());
 
             if(null == user.getCardId() || !user.getCardId().equals(card.getCardId())) { // 未绑定或换绑时激活卡
-                if(!CardDistributeStatus.Assign.getVal().equals(card.getDistributeStatus()) && !CardStatus.Free.getVal().equals(card.getStatus())) {
+                if(!CardDistributeStatus.Assign.getVal().equals(card.getDistributeStatus()) || !CardStatus.Free.getVal().equals(card.getStatus())) {
                     throw new RuntimeException("无效卡");
                 }
                 user.setEvalCounts("{\"1\":1,\"2\":1,\"3\":1,\"11\":1,\"0\":0}");