bug修复调整

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

@@ -53,14 +53,16 @@ public class BaseStudentScholarshipCategoryController {
     @SaCheckPermission("basestudentscholarshipcategory:detail")
     public RT<PageOutput<BaseStudentScholarshipCategoryPageVo>> page(@Valid BaseStudentScholarshipCategoryPageDto dto){
         IPage<BaseStudentScholarshipCategoryPageVo> page = baseStudentScholarshipCategoryService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentScholarshipCategoryPageVo.class,
-            MPJWrappers.<BaseStudentScholarshipCategory>lambdaJoin()
+            MPJWrappers.<BaseStudentScholarshipCategory>lambdaJoin().disableSubLogicDel()
             .like(StrUtil.isNotEmpty(dto.getScholarshipName()), BaseStudentScholarshipCategory::getName, dto.getScholarshipName())
             .like(StrUtil.isNotEmpty(dto.getScholarshipSource()), DictionaryDetail::getName, dto.getScholarshipSource())
             .eq(ObjectUtil.isNotNull(dto.getScholarshipLevel()), BaseStudentScholarshipCategory::getScholarshipLevel, dto.getScholarshipLevel())
             .select(BaseStudentScholarshipCategory::getId)
             .selectAs(DictionaryDetail::getName, BaseStudentScholarshipCategoryPageVo::getScholarshipSourceCn)
+            .select("t2.name", BaseStudentScholarshipCategoryPageVo::getCategoryCn)
             .select(BaseStudentScholarshipCategory.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentScholarshipCategoryPageVo.class).contains(x.getProperty()))
             .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentScholarshipCategory::getScholarshipSource)
+            .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentScholarshipCategory::getCategory)
         );
 
         PageOutput<BaseStudentScholarshipCategoryPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentScholarshipCategoryPageVo.class);

src/main/java/com/xjrsoft/module/student/vo/BaseStudentScholarshipCategoryPageVo.java

@@ -58,4 +58,13 @@ public class BaseStudentScholarshipCategoryPageVo {
     @ApiModelProperty("备注")
     private String remark;
 
+    @ApiModelProperty("奖助学金类型(xjr_dictionary_item[scholarship_category])")
+    private String category;
+
+    @ApiModelProperty("资助单位/个人")
+    private String supportSource;
+
+    @ApiModelProperty("奖助学金类型-中文")
+    private String categoryCn;
+
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentScholarshipCategoryVo.java

@@ -62,4 +62,10 @@ public class BaseStudentScholarshipCategoryVo {
     @ApiModelProperty("baseStudentScholarshipLevel子表")
     private List<BaseStudentScholarshipLevelVo> baseStudentScholarshipLevelList;
 
+    @ApiModelProperty("奖助学金类型(xjr_dictionary_item[scholarship_category])")
+    private String category;
+
+    @ApiModelProperty("资助单位/个人")
+    private String supportSource;
+
 }