代码生成：主子表、树形表的实现

2023-11-17 20:46:02 +08:00
parent 95d5fc4a58
commit ae14ff2f95
237 changed files with 13452 additions and 1611 deletions
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
@@ -6,9 +6,9 @@ import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.*;
 import cn.iocoder.yudao.module.system.convert.dept.DeptConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
@@ -2,16 +2,20 @@ package cn.iocoder.yudao.module.system.controller.admin.dept;

 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.*;
-import cn.iocoder.yudao.module.system.convert.dept.PostConvert;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSimpleRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
 import cn.iocoder.yudao.module.system.service.dept.PostService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -39,16 +43,16 @@ public class PostController {
    @PostMapping("/create")
    @Operation(summary = "创建岗位")
    @PreAuthorize("@ss.hasPermission('system:post:create')")
-    public CommonResult<Long> createPost(@Valid @RequestBody PostCreateReqVO reqVO) {
-        Long postId = postService.createPost(reqVO);
+    public CommonResult<Long> createPost(@Valid @RequestBody PostSaveReqVO createReqVO) {
+        Long postId = postService.createPost(createReqVO);
        return success(postId);
    }

    @PutMapping("/update")
    @Operation(summary = "修改岗位")
    @PreAuthorize("@ss.hasPermission('system:post:update')")
-    public CommonResult<Boolean> updatePost(@Valid @RequestBody PostUpdateReqVO reqVO) {
-        postService.updatePost(reqVO);
+    public CommonResult<Boolean> updatePost(@Valid @RequestBody PostSaveReqVO updateReqVO) {
+        postService.updatePost(updateReqVO);
        return success(true);
    }

@@ -65,35 +69,38 @@ public class PostController {
    @Parameter(name = "id", description = "岗位编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('system:post:query')")
    public CommonResult<PostRespVO> getPost(@RequestParam("id") Long id) {
-        return success(PostConvert.INSTANCE.convert(postService.getPost(id)));
+        PostDO post = postService.getPost(id);
+        return success(BeanUtils.toBean(post, PostRespVO.class));
    }

    @GetMapping("/list-all-simple")
-    @Operation(summary = "获取岗位精简信息列表", description = "只包含被开启的岗位，主要用于前端的下拉选项")
+    @Operation(summary = "获取岗位全列表", description = "只包含被开启的岗位，主要用于前端的下拉选项")
    public CommonResult<List<PostSimpleRespVO>> getSimplePostList() {
        // 获得岗位列表，只要开启状态的
        List<PostDO> list = postService.getPostList(null, Collections.singleton(CommonStatusEnum.ENABLE.getStatus()));
        // 排序后，返回给前端
        list.sort(Comparator.comparing(PostDO::getSort));
-        return success(PostConvert.INSTANCE.convertList02(list));
+        return success(BeanUtils.toBean(list, PostSimpleRespVO.class));
    }

    @GetMapping("/page")
    @Operation(summary = "获得岗位分页列表")
    @PreAuthorize("@ss.hasPermission('system:post:query')")
-    public CommonResult<PageResult<PostRespVO>> getPostPage(@Validated PostPageReqVO reqVO) {
-        return success(PostConvert.INSTANCE.convertPage(postService.getPostPage(reqVO)));
+    public CommonResult<PageResult<PostRespVO>> getPostPage(@Validated PostPageReqVO pageReqVO) {
+        PageResult<PostDO> pageResult = postService.getPostPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, PostRespVO.class));
    }

    @GetMapping("/export")
    @Operation(summary = "岗位管理")
    @PreAuthorize("@ss.hasPermission('system:post:export')")
    @OperateLog(type = EXPORT)
-    public void export(HttpServletResponse response, @Validated PostExportReqVO reqVO) throws IOException {
-        List<PostDO> posts = postService.getPostList(reqVO);
-        List<PostExcelVO> data = PostConvert.INSTANCE.convertList03(posts);
+    public void export(HttpServletResponse response, @Validated PostPageReqVO reqVO) throws IOException {
+        reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<PostDO> list = postService.getPostPage(reqVO).getList();
        // 输出
-        ExcelUtils.write(response, "岗位数据.xls", "岗位列表", PostExcelVO.class, data);
+        ExcelUtils.write(response, "岗位数据.xls", "岗位列表", PostRespVO.class,
+                BeanUtils.toBean(list, PostRespVO.class));
    }

 }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostCreateReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostCreateReqVO.java
@@ -1,11 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Schema(description = "管理后台 - 岗位创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PostCreateReqVO extends PostBaseVO {
-}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExcelVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExcelVO.java
@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-/**
- * 岗位 Excel 导出响应 VO
- */
-@Data
-public class PostExcelVO {
-
-    @ExcelProperty("岗位序号")
-    private Long id;
-
-    @ExcelProperty("岗位编码")
-    private String code;
-
-    @ExcelProperty("岗位名称")
-    private String name;
-
-    @ExcelProperty("岗位排序")
-    private Integer sort;
-
-    @ExcelProperty(value = "状态", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.COMMON_STATUS)
-    private String status;
-
-}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExportReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExportReqVO.java
@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - 岗位导出 Request VO，参数和 PostExcelVO 是一致的")
-@Data
-public class PostExportReqVO {
-
-    @Schema(description = "岗位编码，模糊匹配", example = "yudao")
-    private String code;
-
-    @Schema(description = "岗位名称，模糊匹配", example = "芋道")
-    private String name;
-
-    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
-    private Integer status;
-
-}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostListReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostListReqVO.java
@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Schema(description = "管理后台 - 岗位列表 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PostListReqVO extends PostBaseVO {
-
-    @Schema(description = "岗位名称，模糊匹配", example = "芋道")
-    private String name;
-
-    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
-    private Integer status;
-
-}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostPageReqVO.java
@@ -19,4 +19,4 @@ public class PostPageReqVO extends PageParam {
    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
    private Integer status;

-}
+}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostRespVO.java
@@ -1,20 +1,41 @@
 package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post;

+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.EqualsAndHashCode;

 import java.time.LocalDateTime;

@Schema(description = "管理后台 - 岗位信息 Response VO")
@Data
-@EqualsAndHashCode(callSuper = true)
-public class PostRespVO extends PostBaseVO {
+public class PostRespVO {

    @Schema(description = "岗位序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @ExcelProperty("岗位序号")
    private Long id;

-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
+    @Schema(description = "岗位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "小土豆")
+    @ExcelProperty("岗位名称")
+    private String name;
+
+    @Schema(description = "岗位编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao")
+    @ExcelProperty("岗位编码")
+    private String code;
+
+    @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @ExcelProperty("岗位排序")
+    private Integer sort;
+
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @DictFormat(DictTypeConstants.COMMON_STATUS)
+    private Integer status;
+
+    @Schema(description = "备注", example = "快乐的备注")
+    private String remark;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
    private LocalDateTime createTime;

 }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post;

+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

@@ -7,16 +9,16 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;

-/**
- * 岗位 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
+@Schema(description = "管理后台 - 岗位创建/修改 Request VO")
@Data
-public class PostBaseVO {
+public class PostSaveReqVO {

-    @Schema(description = "岗位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "小博主")
+    @Schema(description = "岗位编号", example = "1024")
+    private Long id;
+
+    @Schema(description = "岗位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "小土豆")
    @NotBlank(message = "岗位名称不能为空")
-    @Size(max = 50, message = "岗位名称长度不能超过50个字符")
+    @Size(max = 50, message = "岗位名称长度不能超过 50 个字符")
    private String name;

    @Schema(description = "岗位编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao")
@@ -28,10 +30,11 @@ public class PostBaseVO {
    @NotNull(message = "显示顺序不能为空")
    private Integer sort;

-    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @InEnum(CommonStatusEnum.class)
    private Integer status;

    @Schema(description = "备注", example = "快乐的备注")
    private String remark;

-}
+}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java
@@ -1,20 +1,19 @@
 package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post;

+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;

-@Schema(description = "管理后台 - 岗位精简信息 Response VO")
+@Schema(description = "管理后台 - 岗位信息的精简 Response VO")
@Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class PostSimpleRespVO {

-    @Schema(description = "岗位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @Schema(description = "岗位序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @ExcelProperty("岗位序号")
    private Long id;

-    @Schema(description = "岗位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "岗位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "小土豆")
+    @ExcelProperty("岗位名称")
    private String name;

 }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostUpdateReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostUpdateReqVO.java
@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 岗位更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PostUpdateReqVO extends PostBaseVO {
-
-    @Schema(description = "岗位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotNull(message = "岗位编号不能为空")
-    private Long id;
-
-}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java
@@ -21,6 +21,8 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
 public class DeptDO extends TenantBaseDO {

+    public static final Long PARENT_ID_ROOT = 0L;
+
    /**
     * 部门ID
     */
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/PostMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/PostMapper.java
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.system.dal.mysql.dept;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -28,13 +27,6 @@ public interface PostMapper extends BaseMapperX<PostDO> {
                .orderByDesc(PostDO::getId));
    }

-    default List<PostDO> selectList(PostExportReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<PostDO>()
-                .likeIfPresent(PostDO::getCode, reqVO.getCode())
-                .likeIfPresent(PostDO::getName, reqVO.getName())
-                .eqIfPresent(PostDO::getStatus, reqVO.getStatus()));
-    }
-
    default PostDO selectByName(String name) {
        return selectOne(PostDO::getName, name);
    }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
@@ -11,7 +11,6 @@ import cn.iocoder.yudao.module.system.convert.dept.DeptConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper;
 import cn.iocoder.yudao.module.system.dal.redis.RedisKeyConstants;
-import cn.iocoder.yudao.module.system.enums.dept.DeptIdEnum;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
@@ -42,14 +41,17 @@ public class DeptServiceImpl implements DeptService {
    @Override
    @CacheEvict(cacheNames = RedisKeyConstants.DEPT_CHILDREN_ID_LIST,
            allEntries = true) // allEntries 清空所有缓存，因为操作一个部门，涉及到多个缓存
-    public Long createDept(DeptCreateReqVO reqVO) {
-        // 校验正确性
-        if (reqVO.getParentId() == null) {
-            reqVO.setParentId(DeptIdEnum.ROOT.getId());
+    public Long createDept(DeptCreateReqVO createReqVO) {
+        if (createReqVO.getParentId() == null) {
+            createReqVO.setParentId(DeptDO.PARENT_ID_ROOT);
        }
-        validateForCreateOrUpdate(null, reqVO.getParentId(), reqVO.getName());
+        // 校验父部门的有效性
+        validateParentDept(null, createReqVO.getParentId());
+        // 校验部门名的唯一性
+        validateDeptNameUnique(null, createReqVO.getParentId(), createReqVO.getName());
+
        // 插入部门
-        DeptDO dept = DeptConvert.INSTANCE.convert(reqVO);
+        DeptDO dept = DeptConvert.INSTANCE.convert(createReqVO);
        deptMapper.insert(dept);
        return dept.getId();
    }
@@ -57,14 +59,19 @@ public class DeptServiceImpl implements DeptService {
    @Override
    @CacheEvict(cacheNames = RedisKeyConstants.DEPT_CHILDREN_ID_LIST,
            allEntries = true) // allEntries 清空所有缓存，因为操作一个部门，涉及到多个缓存
-    public void updateDept(DeptUpdateReqVO reqVO) {
-        // 校验正确性
-        if (reqVO.getParentId() == null) {
-            reqVO.setParentId(DeptIdEnum.ROOT.getId());
+    public void updateDept(DeptUpdateReqVO updateReqVO) {
+        if (updateReqVO.getParentId() == null) {
+            updateReqVO.setParentId(DeptDO.PARENT_ID_ROOT);
        }
-        validateForCreateOrUpdate(reqVO.getId(), reqVO.getParentId(), reqVO.getName());
+        // 校验自己存在
+        validateDeptExists(updateReqVO.getId());
+        // 校验父部门的有效性
+        validateParentDept(updateReqVO.getId(), updateReqVO.getParentId());
+        // 校验部门名的唯一性
+        validateDeptNameUnique(updateReqVO.getId(), updateReqVO.getParentId(), updateReqVO.getName());
+
        // 更新部门
-        DeptDO updateObj = DeptConvert.INSTANCE.convert(reqVO);
+        DeptDO updateObj = DeptConvert.INSTANCE.convert(updateReqVO);
        deptMapper.updateById(updateObj);
    }

@@ -82,15 +89,6 @@ public class DeptServiceImpl implements DeptService {
        deptMapper.deleteById(id);
    }

-    private void validateForCreateOrUpdate(Long id, Long parentId, String name) {
-        // 校验自己存在
-        validateDeptExists(id);
-        // 校验父部门的有效性
-        validateParentDept(id, parentId);
-        // 校验部门名的唯一性
-        validateDeptNameUnique(id, parentId, name);
-    }
-
    @VisibleForTesting
    void validateDeptExists(Long id) {
        if (id == null) {
@@ -104,22 +102,36 @@ public class DeptServiceImpl implements DeptService {

    @VisibleForTesting
    void validateParentDept(Long id, Long parentId) {
-        if (parentId == null || DeptIdEnum.ROOT.getId().equals(parentId)) {
+        if (parentId == null || DeptDO.PARENT_ID_ROOT.equals(parentId)) {
            return;
        }
-        // 不能设置自己为父部门
-        if (parentId.equals(id)) {
+        // 1. 不能设置自己为父部门
+        if (Objects.equals(id, parentId)) {
            throw exception(DEPT_PARENT_ERROR);
        }
-        // 父岗位不存在
-        DeptDO dept = deptMapper.selectById(parentId);
-        if (dept == null) {
+        // 2. 父部门不存在
+        DeptDO parentDept = deptMapper.selectById(parentId);
+        if (parentDept == null) {
            throw exception(DEPT_PARENT_NOT_EXITS);
        }
-        // 父部门不能是原来的子部门
-        List<DeptDO> children = getChildDeptList(id);
-        if (children.stream().anyMatch(dept1 -> dept1.getId().equals(parentId))) {
-            throw exception(DEPT_PARENT_IS_CHILD);
+        // 3. 递归校验父部门，如果父部门是自己的子部门，则报错，避免形成环路
+        if (id == null) { // id 为空，说明新增，不需要考虑环路
+            return;
+        }
+        for (int i = 0; i < Short.MAX_VALUE; i++) {
+            // 3.1 校验环路
+            parentId = parentDept.getParentId();
+            if (Objects.equals(id, parentId)) {
+                throw exception(DEPT_PARENT_IS_CHILD);
+            }
+            // 3.2 继续递归下一级父部门
+            if (parentId == null || DeptDO.PARENT_ID_ROOT.equals(parentId)) {
+                break;
+            }
+            parentDept = deptMapper.selectById(parentId);
+            if (parentDept == null) {
+                break;
+            }
        }
    }

@@ -129,7 +141,7 @@ public class DeptServiceImpl implements DeptService {
        if (dept == null) {
            return;
        }
-        // 如果 id 为空，说明不用比较是否为相同 id 的岗位
+        // 如果 id 为空，说明不用比较是否为相同 id 的部门
        if (id == null) {
            throw exception(DEPT_NAME_DUPLICATE);
        }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java
@@ -2,10 +2,8 @@ package cn.iocoder.yudao.module.system.service.dept;

 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostCreateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostPageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostUpdateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
 import org.springframework.lang.Nullable;

@@ -24,17 +22,17 @@ public interface PostService {
    /**
     * 创建岗位
     *
-     * @param reqVO 岗位信息
+     * @param createReqVO 岗位信息
     * @return 岗位编号
     */
-    Long createPost(PostCreateReqVO reqVO);
+    Long createPost(PostSaveReqVO createReqVO);

    /**
     * 更新岗位
     *
-     * @param reqVO 岗位信息
+     * @param updateReqVO 岗位信息
     */
-    void updatePost(PostUpdateReqVO reqVO);
+    void updatePost(PostSaveReqVO updateReqVO);

    /**
     * 删除岗位信息
@@ -70,14 +68,6 @@ public interface PostService {
     */
    PageResult<PostDO> getPostPage(PostPageReqVO reqVO);

-    /**
-     * 获得岗位列表
-     *
-     * @param reqVO 查询条件
-     * @return 部门列表
-     */
-    List<PostDO> getPostList(PostExportReqVO reqVO);
-
    /**
     * 获得岗位信息
     *
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
@@ -3,11 +3,9 @@ package cn.iocoder.yudao.module.system.service.dept;
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostCreateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostExportReqVO;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostPageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostUpdateReqVO;
-import cn.iocoder.yudao.module.system.convert.dept.PostConvert;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
 import cn.iocoder.yudao.module.system.dal.mysql.dept.PostMapper;
 import org.springframework.stereotype.Service;
@@ -35,23 +33,23 @@ public class PostServiceImpl implements PostService {
    private PostMapper postMapper;

    @Override
-    public Long createPost(PostCreateReqVO reqVO) {
+    public Long createPost(PostSaveReqVO createReqVO) {
        // 校验正确性
-        validatePostForCreateOrUpdate(null, reqVO.getName(), reqVO.getCode());
+        validatePostForCreateOrUpdate(null, createReqVO.getName(), createReqVO.getCode());

        // 插入岗位
-        PostDO post = PostConvert.INSTANCE.convert(reqVO);
+        PostDO post = BeanUtils.toBean(createReqVO, PostDO.class);
        postMapper.insert(post);
        return post.getId();
    }

    @Override
-    public void updatePost(PostUpdateReqVO reqVO) {
+    public void updatePost(PostSaveReqVO updateReqVO) {
        // 校验正确性
-        validatePostForCreateOrUpdate(reqVO.getId(), reqVO.getName(), reqVO.getCode());
+        validatePostForCreateOrUpdate(updateReqVO.getId(), updateReqVO.getName(), updateReqVO.getCode());

        // 更新岗位
-        PostDO updateObj = PostConvert.INSTANCE.convert(reqVO);
+        PostDO updateObj = BeanUtils.toBean(updateReqVO, PostDO.class);
        postMapper.updateById(updateObj);
    }

@@ -119,11 +117,6 @@ public class PostServiceImpl implements PostService {
        return postMapper.selectPage(reqVO);
    }

-    @Override
-    public List<PostDO> getPostList(PostExportReqVO reqVO) {
-        return postMapper.selectList(reqVO);
-    }
-
    @Override
    public PostDO getPost(Long id) {
        return postMapper.selectById(id);
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java
@@ -8,7 +8,6 @@ import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqV
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper;
-import cn.iocoder.yudao.module.system.enums.dept.DeptIdEnum;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;

@@ -41,7 +40,7 @@ public class DeptServiceImplTest extends BaseDbUnitTest {
    public void testCreateDept() {
        // 准备参数
        DeptCreateReqVO reqVO = randomPojo(DeptCreateReqVO.class, o -> {
-            o.setParentId(DeptIdEnum.ROOT.getId());
+            o.setParentId(DeptDO.PARENT_ID_ROOT);
            o.setStatus(randomCommonStatus());
        });

@@ -62,7 +61,7 @@ public class DeptServiceImplTest extends BaseDbUnitTest {
        // 准备参数
        DeptUpdateReqVO reqVO = randomPojo(DeptUpdateReqVO.class, o -> {
            // 设置更新的 ID
-            o.setParentId(DeptIdEnum.ROOT.getId());
+            o.setParentId(DeptDO.PARENT_ID_ROOT);
            o.setId(dbDeptDO.getId());
            o.setStatus(randomCommonStatus());
        });
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImplTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImplTest.java
@@ -4,10 +4,8 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostCreateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostPageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostUpdateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
 import cn.iocoder.yudao.module.system.dal.mysql.dept.PostMapper;
 import org.junit.jupiter.api.Test;
@@ -44,7 +42,7 @@ public class PostServiceImplTest extends BaseDbUnitTest {
    @Test
    public void testCreatePost_success() {
        // 准备参数
-        PostCreateReqVO reqVO = randomPojo(PostCreateReqVO.class,
+        PostSaveReqVO reqVO = randomPojo(PostSaveReqVO.class,
                o -> o.setStatus(randomEle(CommonStatusEnum.values()).getStatus()));
        // 调用
        Long postId = postService.createPost(reqVO);
@@ -62,7 +60,7 @@ public class PostServiceImplTest extends BaseDbUnitTest {
        PostDO postDO = randomPostDO();
        postMapper.insert(postDO);// @Sql: 先插入出一条存在的数据
        // 准备参数
-        PostUpdateReqVO reqVO = randomPojo(PostUpdateReqVO.class, o -> {
+        PostSaveReqVO reqVO = randomPojo(PostSaveReqVO.class, o -> {
            // 设置更新的 ID
            o.setId(postDO.getId());
            o.setStatus(randomEle(CommonStatusEnum.values()).getStatus());
@@ -103,9 +101,9 @@ public class PostServiceImplTest extends BaseDbUnitTest {
        PostDO postDO = randomPostDO();
        postMapper.insert(postDO);// @Sql: 先插入出一条存在的数据
        // 准备参数
-        PostCreateReqVO reqVO = randomPojo(PostCreateReqVO.class,
-            // 模拟 name 重复
-            o -> o.setName(postDO.getName()));
+        PostSaveReqVO reqVO = randomPojo(PostSaveReqVO.class,
+                // 模拟 name 重复
+                o -> o.setName(postDO.getName()));
        assertServiceException(() -> postService.createPost(reqVO), POST_NAME_DUPLICATE);
    }

@@ -118,7 +116,7 @@ public class PostServiceImplTest extends BaseDbUnitTest {
        PostDO codePostDO = randomPostDO();
        postMapper.insert(codePostDO);
        // 准备参数
-        PostUpdateReqVO reqVO = randomPojo(PostUpdateReqVO.class, o -> {
+        PostSaveReqVO reqVO = randomPojo(PostSaveReqVO.class, o -> {
            // 设置更新的 ID
            o.setId(postDO.getId());
            // 模拟 code 重复
@@ -154,30 +152,6 @@ public class PostServiceImplTest extends BaseDbUnitTest {
        assertPojoEquals(postDO, pageResult.getList().get(0));
    }

-    @Test
-    public void testGetPostList_export() {
-        // mock 数据
-        PostDO postDO = randomPojo(PostDO.class, o -> {
-            o.setName("码仔");
-            o.setStatus(CommonStatusEnum.ENABLE.getStatus());
-        });
-        postMapper.insert(postDO);
-        // 测试 name 不匹配
-        postMapper.insert(cloneIgnoreId(postDO, o -> o.setName("程序员")));
-        // 测试 status 不匹配
-        postMapper.insert(cloneIgnoreId(postDO, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
-        // 准备参数
-        PostExportReqVO reqVO = new PostExportReqVO();
-        reqVO.setName("码");
-        reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-
-        // 调用
-        List<PostDO> list = postService.getPostList(reqVO);
-        // 断言
-        assertEquals(1, list.size());
-        assertPojoEquals(postDO, list.get(0));
-    }
-
    @Test
    public void testGetPostList() {
        // mock 数据