夏文涛 1 年間 前
コミット
b97db4ef43

+ 1 - 1
src/main/java/com/template/controller/WelcomeStudentController.java

@@ -769,7 +769,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             for (WelcomeStudent ws : result) {
                 Optional<WelcomeStudent> ows = existStudents.stream().filter(e -> e.getCardId().equals(ws.getCardId())).findFirst();
                 if (ows != null && ows.isPresent()) {
-                    ws.setId(ws.getId());
+                    ws.setId(ows.get().getId());
                     ws.setAdmissNum(ws.getAdmissNum());//录取号
                     ws.setName(ws.getName());//姓名
                     ws.setCardId(ws.getCardId());//身份证号

+ 1 - 0
src/main/java/com/template/services/impl/WelcomeStudentServiceImpl.java

@@ -169,6 +169,7 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     public List<WelcomeStudent> queryStudentByCardId(List<String> cardIds) {
         QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
         queryWrapper.in(cardIds != null && cardIds.size() > 0, "card_id", cardIds);//身份证号
+        queryWrapper.eq("iden_type",1);
         List<WelcomeStudent> result = welcomeStudentMapper.selectList(queryWrapper);
         return (cardIds != null && cardIds.size() > 0) ? result : null;
     }