修改返回数据

src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java

@@ -194,8 +194,8 @@ public class MaterialTaskController {
                 .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, MaterialTypeAssign::getUserId)
                 .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId, ext -> ext.selectAs(Department::getName, MaterialTaskAssignVo::getDeptName))
         ;
-        IPage<MaterialTaskAssign> page = materialTaskAssignService.page(ConventPage.getPage(dto), queryWrapper);
-        PageOutput<MaterialTaskAssignVo> pageOutput = ConventPage.getPageOutput(page, MaterialTaskAssignVo.class);
+        IPage<MaterialTaskAssignVo> page = materialTaskAssignService.selectJoinListPage(ConventPage.getPage(dto), MaterialTaskAssignVo.class, queryWrapper);
+        PageOutput<MaterialTaskAssignVo> pageOutput = ConventPage.getPageOutput(page);
         return RT.ok(pageOutput);
     }
 

src/main/java/com/xjrsoft/module/material/controller/MaterialTypeController.java

@@ -24,6 +24,7 @@ import com.alibaba.excel.EasyExcel;
 import com.xjrsoft.module.material.entity.MaterialTypeAssign;
 import com.xjrsoft.module.material.service.IMaterialTypeAssignService;
 import com.xjrsoft.module.material.vo.MaterialTypeAssignVo;
+import com.xjrsoft.module.oa.vo.NewsRelationVo;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
@@ -161,16 +162,15 @@ public class MaterialTypeController {
                 .disableSubLogicDel()
                 .eq(ObjectUtil.isNotEmpty(dto.getMaterialTypeId()) && dto.getMaterialTypeId() > 0, MaterialTypeAssign::getMaterialTypeId, dto.getMaterialTypeId())
                 .select(MaterialTypeAssign::getId)
-                .selectAs(MaterialType::getName, MaterialTypeAssignVo::getMaterialTypeName)
-                .leftJoin(MaterialType.class, MaterialType::getId, MaterialTypeAssign::getMaterialTypeId)
-//                .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeAssignVo.class).contains(x.getProperty()))
+                .leftJoin(MaterialType.class, MaterialType::getId, MaterialTypeAssign::getMaterialTypeId,ext->ext.selectAs(MaterialType::getName, MaterialTypeAssignVo::getMaterialTypeName))
+                .select(MaterialTypeAssign.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeAssignVo.class).contains(x.getProperty()))
                 .innerJoin(XjrUser.class, XjrUser::getId, MaterialTypeAssign::getUserId, ext -> ext.selectAs(XjrUser::getUserName, MaterialTypeAssignVo::getUserName))
                 .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, MaterialTypeAssign::getUserId)
                 .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId, ext -> ext.selectAs(Department::getName, MaterialTypeAssignVo::getDeptName))
         ;
 
-        IPage<MaterialTypeAssign> page = materialTypeAssignService.page(ConventPage.getPage(dto), queryWrapper);
-        PageOutput<MaterialTypeAssignVo> pageOutput = ConventPage.getPageOutput(page, MaterialTypeAssignVo.class);
+        IPage<MaterialTypeAssignVo> page = materialTypeAssignService.selectJoinListPage(ConventPage.getPage(dto),MaterialTypeAssignVo.class, queryWrapper);
+        PageOutput<MaterialTypeAssignVo> pageOutput = ConventPage.getPageOutput(page);
         return RT.ok(pageOutput);
     }