课程学科模块调整

src/main/java/com/xjrsoft/module/base/controller/BaseCourseSubjectController.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.base.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -58,7 +59,9 @@ public class BaseCourseSubjectController {
         queryWrapper
                 .orderByDesc(BaseCourseSubject::getId)
                 .select(BaseCourseSubject::getId)
-                .select(BaseCourseSubject.class, x -> VoToColumnUtil.fieldsToColumns(BaseCourseSubjectPageVo.class).contains(x.getProperty()));
+                .select(BaseCourseSubject.class, x -> VoToColumnUtil.fieldsToColumns(BaseCourseSubjectPageVo.class).contains(x.getProperty()))
+                .like(StrUtil.isNotEmpty(dto.getName()), BaseCourseSubject::getName, dto.getName())
+                .like(StrUtil.isNotEmpty(dto.getCode()), BaseCourseSubject::getCode, dto.getCode());
         IPage<BaseCourseSubject> page = baseCourseSubjectService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<BaseCourseSubjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseCourseSubjectPageVo.class);
         return RT.ok(pageOutput);
@@ -69,7 +72,7 @@ public class BaseCourseSubjectController {
     @SaCheckPermission("basecoursesubject:detail")
     @XjrLog(value = "根据id查询课程学科信息")
     public RT<BaseCourseSubjectVo> info(@RequestParam Long id) {
-        BaseCourseSubject baseCourseSubject = baseCourseSubjectService.getById(id);
+        BaseCourseSubject baseCourseSubject = baseCourseSubjectService.getByIdDeep(id);
         if (baseCourseSubject == null) {
             return RT.error("找不到此数据！");
         }

src/main/java/com/xjrsoft/module/base/dto/BaseCourseSubjectPageDto.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.base.dto;
 
 import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,5 +16,9 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class BaseCourseSubjectPageDto extends PageInput {
 
+    @ApiModelProperty("课程学科名称")
+    private String name;
 
+    @ApiModelProperty("课程学科代码")
+    private String code;
 }