bug修复

src/main/java/com/xjrsoft/module/student/controller/BaseStudentScholarshipCategoryController.java

@@ -60,6 +60,7 @@ public class BaseStudentScholarshipCategoryController {
             .like(StrUtil.isNotEmpty(dto.getScholarshipName()), BaseStudentScholarshipCategory::getName, dto.getScholarshipName())
             .like(StrUtil.isNotEmpty(dto.getScholarshipSource()), DictionaryDetail::getCode, dto.getScholarshipSource())
             .eq(ObjectUtil.isNotNull(dto.getScholarshipLevel()), BaseStudentScholarshipCategory::getScholarshipLevel, dto.getScholarshipLevel())
+            .eq(ObjectUtil.isNotNull(dto.getBaseSemesterId()), BaseStudentScholarshipCategory::getBaseSemesterId, dto.getBaseSemesterId())
             .select(BaseStudentScholarshipCategory::getId)
             .selectAs(DictionaryDetail::getName, BaseStudentScholarshipCategoryPageVo::getScholarshipSourceCn)
             .select("t2.name", BaseStudentScholarshipCategoryPageVo::getCategoryCn)

src/main/java/com/xjrsoft/module/student/dto/BaseStudentScholarshipCategoryPageDto.java

@@ -24,4 +24,7 @@ public class BaseStudentScholarshipCategoryPageDto extends PageInput {
 
     @ApiModelProperty("奖学金等级")
     private Integer scholarshipLevel;
+
+    @ApiModelProperty("学期id")
+    private Long baseSemesterId;
 }