/student/cadreDept 查询时不使用MPJLambdaWrapper

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

@@ -152,7 +152,7 @@ public class BaseStudentCadreController {
 
         // 没传ClassID 不用查部门
         if(ObjectUtil.isAllEmpty(dto.getClassId())||dto.getClassId()==0) {
-            wrapper.selectAs(Department::getName, BaseStudentCadrePageVo::getOrgName)
+            wrapper.selectAs(Department::getName, BaseStudentCadrePageVo::getCadreDeptIdCN)
                     .leftJoin(CadreDept.class, CadreDept::getId, BaseStudentCadre::getCadreDeptId);
         }
 

src/main/java/com/xjrsoft/module/student/entity/BaseStudentCadre.java

@@ -115,11 +115,6 @@ public class BaseStudentCadre implements Serializable {
     */
     @ApiModelProperty("状态（1:在职 0:离职）")
     private Integer status;
-    /**
-     * 人员类型（1:教师 2:学生）
-     */
-    @ApiModelProperty("人员类型（1:教师 2:学生）")
-    private Integer personnelType;
     /**
     * 离职生效日期
     */

src/main/java/com/xjrsoft/module/student/mapper/CadreDeptMapper.java

@@ -2,9 +2,13 @@ package com.xjrsoft.module.student.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.dto.CadreDeptTreeDto;
 import com.xjrsoft.module.student.entity.CadreDept;
+import com.xjrsoft.module.student.vo.CadreDeptTreeVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
 * @title: 干部部门
 * @Author szs
@@ -13,5 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface CadreDeptMapper extends MPJBaseMapper<CadreDept> {
-
+    List<CadreDeptTreeVo> getCadreDeptTree(CadreDeptTreeDto dto);
 }

src/main/java/com/xjrsoft/module/student/service/impl/CadreDeptServiceImpl.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 @Service
 @AllArgsConstructor
 public class CadreDeptServiceImpl extends MPJBaseServiceImpl<CadreDeptMapper, CadreDept> implements ICadreDeptService {
+    private final CadreDeptMapper cadreDeptMapper;
     @Override
     public List<CadreDeptTreeVo> getCadreDeptTree() {
         CadreDeptTreeDto dto = new CadreDeptTreeDto();
@@ -40,14 +41,8 @@ public class CadreDeptServiceImpl extends MPJBaseServiceImpl<CadreDeptMapper, Ca
 
     @Override
     public List<CadreDeptTreeVo> getCadreDeptTree(CadreDeptTreeDto dto) {
-        MPJLambdaWrapper<CadreDept> queryWrapper = new MPJLambdaWrapper<>();
-        queryWrapper
-                .selectAs(XjrUser::getName, CadreDeptTreeVo::getInstructorUserIdCN)
-                .select(CadreDept.class, x -> VoToColumnUtil.fieldsToColumns(CadreDeptTreeVo.class).contains(x.getProperty()))
-                .leftJoin(XjrUser.class, XjrUser::getId, CadreDept::getInstructorUserId)
-                .orderByDesc(CadreDept::getId);
 
-        List<CadreDeptTreeVo> list = this.selectJoinList(CadreDeptTreeVo.class,queryWrapper);
+        List<CadreDeptTreeVo> list = cadreDeptMapper.getCadreDeptTree(dto);
 
         List<CadreDeptTreeVo> treeVoList = TreeUtil.build(list);
         return treeVoList;

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

@@ -176,7 +176,7 @@ public class BaseStudentCadrePageVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("学生任职机构名称")
     @ApiModelProperty("学生任职机构名称")
-    private String orgName;
+    private String cadreDeptIdCN;
 
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("手机号")

src/main/resources/mapper/student/CadreDeptMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.student.mapper.CadreDeptMapper">
+    <select id="getCadreDeptTree" parameterType="com.xjrsoft.module.student.dto.CadreDeptTreeDto"
+            resultType="com.xjrsoft.module.student.vo.CadreDeptTreeVo">
+        SELECT
+            t.*,
+            t1.name AS instructorUserIdCN
+        FROM cadre_dept t
+                 LEFT JOIN xjr_user t1 ON (t1.id = t.instructor_user_id)
+        WHERE t.delete_mark = 0
+        ORDER BY t.id DESC
+    </select>
+</mapper>