|
|
@@ -58,7 +58,7 @@ public class BaseStudentScholarshipCategoryController {
|
|
|
IPage<BaseStudentScholarshipCategoryPageVo> page = categoryService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentScholarshipCategoryPageVo.class,
|
|
|
MPJWrappers.<BaseStudentScholarshipCategory>lambdaJoin().disableSubLogicDel()
|
|
|
.like(StrUtil.isNotEmpty(dto.getScholarshipName()), BaseStudentScholarshipCategory::getName, dto.getScholarshipName())
|
|
|
- .like(StrUtil.isNotEmpty(dto.getScholarshipSource()), DictionaryDetail::getName, dto.getScholarshipSource())
|
|
|
+ .like(StrUtil.isNotEmpty(dto.getScholarshipSource()), DictionaryDetail::getCode, dto.getScholarshipSource())
|
|
|
.eq(ObjectUtil.isNotNull(dto.getScholarshipLevel()), BaseStudentScholarshipCategory::getScholarshipLevel, dto.getScholarshipLevel())
|
|
|
.select(BaseStudentScholarshipCategory::getId)
|
|
|
.selectAs(DictionaryDetail::getName, BaseStudentScholarshipCategoryPageVo::getScholarshipSourceCn)
|
