|
@@ -14,13 +14,16 @@ import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
+import org.jeecg.modules.system.service.ISysCategoryService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.util.Arrays;
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
/**
|
|
|
* @Description: course
|
|
@@ -39,6 +42,9 @@ public class CourseController extends JeecgController<Course, ICourseService> {
|
|
|
@Autowired
|
|
|
private ICourseCatalogService courseCatalogService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ISysCategoryService sysCategoryService;
|
|
|
+
|
|
|
/**
|
|
|
* 分页列表查询
|
|
|
*
|
|
@@ -59,6 +65,10 @@ public class CourseController extends JeecgController<Course, ICourseService> {
|
|
|
QueryWrapper<Course> queryWrapper = QueryGenerator.initQueryWrapper(course, req.getParameterMap());
|
|
|
Page<Course> page = new Page<Course>(pageNo, pageSize);
|
|
|
IPage<Course> pageList = courseService.page(page, queryWrapper);
|
|
|
+ if (!Objects.isNull(pageList) && !CollectionUtils.isEmpty(pageList.getRecords())) {
|
|
|
+ pageList.getRecords().forEach(record -> record.setCategoryName(String.join(",",
|
|
|
+ sysCategoryService.loadDictItem(record.getCategoryId()))));
|
|
|
+ }
|
|
|
return Result.OK(pageList);
|
|
|
}
|
|
|
|