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 a566f02b..b91dba80 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
@@ -435,4 +435,41 @@ public class AiolClassController extends JeecgController<AiolClass, IAiolClassSe
 			return Result.error("导入学生失败: " + e.getMessage());
 		}
 	}
+
+	/**
+	 * 查询班级列表
+	 *
+	 * @param courseId 可选课程ID；不传时查询当前登录用户创建的全部班级
+	 * @param request  HTTP请求对象，用于获取登录态
+	 * @return 班级列表
+	 */
+	@Operation(summary = "查询班级列表", description = "参数courseId可选；不传则查当前登录用户创建的全部班级，传则查对应课程id的班级")
+	@GetMapping(value = "/query_list")
+	public Result<List<AiolClass>> queryClassList(
+			@RequestParam(name = "courseId", required = false) String courseId,
+			HttpServletRequest request) {
+		try {
+			QueryWrapper<AiolClass> queryWrapper = new QueryWrapper<>();
+
+			if (courseId == null || courseId.trim().isEmpty()) {
+				// 未传courseId，查询当前登录用户创建的班级
+				String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
+				String username = JwtUtil.getUsername(token);
+				LoginUser sysUser = sysBaseApi.getUserByName(username);
+				if (sysUser == null) {
+					return Result.error("用户未登录或登录已过期");
+				}
+				queryWrapper.eq("create_by", sysUser.getUsername());
+			} else {
+				// 传了courseId，按课程查询
+				queryWrapper.eq("course_id", courseId);
+			}
+
+			List<AiolClass> list = aiolClassService.list(queryWrapper);
+			return Result.OK(list);
+		} catch (Exception e) {
+			log.error("查询班级列表失败: courseId={}, error={}", courseId, e.getMessage(), e);
+			return Result.error("查询班级列表失败: " + e.getMessage());
+		}
+	}
 }