From 40f362f8c120a94f35e28dcba6e70b5e42c6d599 Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期二, 24 十月 2023 20:32:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java index 292229c..f90ee7a 100644 --- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java +++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java @@ -98,7 +98,7 @@ participantVo.setIdcard(participant.getIdcard()); Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday())); participantVo.setAge(age); - Student student = studentClient.queryStudentByPhone(participant.getPhone()); + Student student = studentClient.queryStudentByPhone(participant.getPhone()==null?"0":participant.getPhone()); if(null != student){ Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId()); participantVo.setResidueClassHour(integer); -- Gitblit v1.7.1