登录匹配

src/main/java/com/template/controller/LoginController.java

@@ -462,7 +462,7 @@ public class LoginController implements LoginControllerAPI {
 
         WelcomeStudent student = welcomeStudentService.getDataByIdcardOrNum(mlr.getAdmissNum(), mlr.getCardId());
         if (student == null) {
-            return CommonResult.fail("录取号或身份证错误，登录失败！");
+            return CommonResult.fail("录取号和身份证不匹配，登录失败！");
         }
         if (StringUtils.hasText(student.getCardId())) {
             if (StringUtils.hasText(student.getSex())) {

src/main/java/com/template/services/impl/WelcomeStudentServiceImpl.java

@@ -168,9 +168,8 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     @Override
     public WelcomeStudent getDataByIdcardOrNum(String admissNum, String cardId) {
         QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
-        queryWrapper.and(e -> e.eq(StringUtils.hasText(admissNum), "admiss_num", admissNum)
-                .or()
-                .eq(StringUtils.hasText(cardId), "card_id", cardId));
+        queryWrapper.eq(StringUtils.hasText(admissNum), "admiss_num", admissNum);
+        queryWrapper.eq(StringUtils.hasText(cardId), "card_id", cardId);
         queryWrapper.eq("iden_type",1);
         List<WelcomeStudent> result = welcomeStudentMapper.selectList(queryWrapper);
         return (result != null && result.size() > 0) ? result.get(0) : null;