From 93a5b7e3b2df064dfebd808b24ebd6e6154ff48b Mon Sep 17 00:00:00 2001
From: GoCo <guochen0829@163.com>
Date: Thu, 18 Sep 2025 09:27:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20student=5Flist=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=99=A2=E6=A0=A1=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aiol/controller/AiolClassController.java  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/controller/AiolClassController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/controller/AiolClassController.java
index c442b5e6..dd3b176b 100644
--- a/jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/controller/AiolClassController.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/controller/AiolClassController.java
@@ -21,6 +21,7 @@ import org.jeecg.modules.aiol.service.IAiolUserInfoService;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.aiol.mapper.AiolUserInfoMapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -60,6 +61,8 @@ public class AiolClassController extends JeecgController<AiolClass, IAiolClassSe
 	private ISysUserService sysUserService;
 	@Autowired
 	private IAiolUserInfoService aiolUserInfoService;
+	@Autowired
+	private AiolUserInfoMapper aiolUserInfoMapper;
 	
 	/**
 	 * 分页列表查询
@@ -272,6 +275,25 @@ public class AiolClassController extends JeecgController<AiolClass, IAiolClassSe
 					studentInfo.put("phone", sysUser.getPhone());
 					studentInfo.put("email", sysUser.getEmail());
 					studentInfo.put("status", sysUser.getStatus());
+					studentInfo.put("sex", sysUser.getSex());
+					studentInfo.put("birthday", sysUser.getBirthday());
+				}
+				
+				// 查询学生扩展信息（aiol_user_info）
+				QueryWrapper<AiolUserInfo> userInfoWrapper = new QueryWrapper<>();
+				userInfoWrapper.eq("user_id", classStudent.getStudentId());
+				AiolUserInfo userInfo = aiolUserInfoMapper.selectOne(userInfoWrapper);
+				if (userInfo != null) {
+					studentInfo.put("major", userInfo.getMajor());
+					studentInfo.put("college", userInfo.getCollege());
+					studentInfo.put("education", userInfo.getEducation());
+					studentInfo.put("title", userInfo.getTitle());
+				} else {
+					// 如果没有扩展信息，设置默认值
+					studentInfo.put("major", "");
+					studentInfo.put("college", "");
+					studentInfo.put("education", "");
+					studentInfo.put("title", "");
 				}
 				
 				result.add(studentInfo);