From 8064549857d1cbfc9e7b80024f666a3b006ed3e0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 三月 2025 21:37:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java        |    6 ++----
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java |    6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
index b91139e..a01a29e 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
@@ -127,9 +127,7 @@
             } else {
                 TStudent student = new TStudent();
                 student.setId(editParticipant.getId());
-
-                TStudent student1 = studentClient.queryById(editParticipant.getId());
-                student.setName(student1.getName());
+                student.setName(editParticipant.getName());
                 student.setIdCard(editParticipant.getIdcard());
                 student.setHeadImg(editParticipant.getHeadImg());
                 if (editParticipant.getHeight() != null) {
@@ -138,7 +136,7 @@
                 if (editParticipant.getWeight() != null) {
                     student.setWeight(editParticipant.getWeight());
                 }
-                if (ToolUtil.isNotEmpty(student.getName()) && ToolUtil.isNotEmpty(student.getIdCard())) {
+                if (ToolUtil.isNotEmpty(editParticipant.getName()) && ToolUtil.isNotEmpty(student.getIdCard())) {
                     Boolean aBoolean = JuHeUtil.idcardAuthentication(student.getIdCard(), student.getName());
                     if (!aBoolean) {
                         return ResultUtil.error("身份证和姓名不匹配");
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index e05f07f..4e0c28d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -309,7 +309,7 @@
             HashMap<String, String> map5 = new HashMap<>();
             map5.put("space_id", store + "");
             map5.put("area_id", site + "");
-            String s5 = HttpRequestUtil.getRequest("https://try.daowepark.com/v7/user_api/general/get_space_sutu", map5);
+            String s5 = HttpRequestUtil.getRequest("https://port.daowepark.com/v7/user_api/general/get_space_sutu", map5);
             System.err.println(s5);
             JSONObject jsonObject5 = new JSONObject(s5);
             JSONArray data = jsonObject5.getJSONArray("data");
@@ -332,8 +332,8 @@
                 map4.put("name", red);
                 map3.put("city_code", city);
                 map4.put("city_code", city);
-                String s3 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map3);
-                String s4 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map4);
+                String s3 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpaceSutu", map3);
+                String s4 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpaceSutu", map4);
                 JSONObject jsonObject = new JSONObject(s3);
                 JSONObject jsonObject1 = new JSONObject(s4);
                 // 获取 data 字段的值

--
Gitblit v1.7.1