From 73b2edc618dc9ba9ecfc496b22157c3c9afceb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Mon, 29 Jul 2024 19:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=8A=A5=E5=90=8D=E4=BC=A0?=
 =?UTF-8?q?=E5=85=A5=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9=E4=B8=BAid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...alCompetitionProjectRegistrationController.java |  2 +-
 .../AnnualCompetitionProjectRegistration.data.ts   | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
index 05841c76..2aa65af5 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
@@ -595,7 +595,7 @@ public class AnnualCompetitionProjectRegistrationController {
             //设置报名编号
             management.setEnrollCode(enrollCode);
             //根据名称查用户id(如果前端传的只是姓名的话)
-            SysUser user = sysUserService.query().eq("realname", management.getUserId()).one();
+            SysUser user = sysUserService.query().eq("id", management.getUserId()).one();
             management.setUserId(user.getId());
             //补全用户未输入信息  -- 是否队长
             if (management.getCaptain() == null)
diff --git a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts
index 0b662249..15da55c8 100644
--- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts
+++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistration.data.ts
@@ -114,15 +114,25 @@ export const formSchema: FormSchema[] = [
 export const teamManagementColumns: JVxeColumn[] = [
     {
         title: '用户',
-        key: 'userId',
+        key: 'realname',
         type: JVxeTypes.popup,
         popupCode: 'user_code',
-        fieldConfig: [{source: 'realname', target: 'userId'}],
+        fieldConfig: [
+          {source: 'id', target: 'userId'},
+          { source: 'realname', target: 'realname' }
+        ],
 
         width: '200px',
         placeholder: '请输入${title}',
         defaultValue: '',
     },
+
+  {
+    label: '',
+    field: 'userId',
+    component: 'Input',
+    show: false,
+  },
     {
         title: '是否队长',
         key: 'captain',