From b2116edaa629f2d678b2070d4265e2702b65f127 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期四, 17 九月 2026 17:10:39 +0800
Subject: [PATCH] feat&bug:文档相关数据优化内容

---
 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 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 283b5f7..be89b0d 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
@@ -339,16 +339,27 @@
                 competitionUser.setPhone(participant.getPhone());
                 competitionUser.setIdCard(participant.getIdcard());
             }else{
-                TStudent tStudent = studentClient.queryById(userCompetition.getParticipantId());
-                AppUser appUser = userMap.get(tStudent.getAppUserId());
-                if (appUser!=null){
+                AppUser appUser = userMap.get(userCompetition.getAppUserId());
+                if (appUser != null){
                     competitionUser.setAppUserId(appUser.getId());
                     competitionUser.setRegisterPhone(appUser.getPhone());
                 }
-                competitionUser.setName(tStudent.getName());
-                competitionUser.setSex(tStudent.getSex());
-                competitionUser.setPhone(tStudent.getPhone());
-                competitionUser.setIdCard(tStudent.getIdCard());
+                if (userCompetition.getParticipantId() != null) {
+                    TStudent tStudent = studentClient.queryById(userCompetition.getParticipantId());
+                    if (tStudent != null) {
+                        if (appUser == null) {
+                            appUser = userMap.get(tStudent.getAppUserId());
+                            if (appUser != null) {
+                                competitionUser.setAppUserId(appUser.getId());
+                                competitionUser.setRegisterPhone(appUser.getPhone());
+                            }
+                        }
+                        competitionUser.setName(tStudent.getName());
+                        competitionUser.setSex(tStudent.getSex());
+                        competitionUser.setPhone(tStudent.getPhone());
+                        competitionUser.setIdCard(tStudent.getIdCard());
+                    }
+                }
             }
             if(null != paymentCompetition){
                 competitionUser.setState(paymentCompetition.getPayStatus());

--
Gitblit v1.7.1