add 新增岗位编码以及查询

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java

@@ -23,6 +23,11 @@ public class SysPost extends TenantEntity {
     @TableId(value = "post_id")
     private Long postId;
 
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
     /**
      * 岗位编码
      */
@@ -33,6 +38,11 @@ public class SysPost extends TenantEntity {
      */
     private String postName;
 
+    /**
+     * 岗位类别编码
+     */
+    private String postCategory;
+
     /**
      * 岗位排序
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java

@@ -25,6 +25,12 @@ public class SysPostBo extends BaseEntity {
      */
     private Long postId;
 
+    /**
+     * 部门id
+     */
+    @NotNull(message = "部门id不能为空")
+    private Long deptId;
+
     /**
      * 岗位编码
      */
@@ -39,6 +45,12 @@ public class SysPostBo extends BaseEntity {
     @Size(min = 0, max = 50, message = "岗位名称长度不能超过{max}个字符")
     private String postName;
 
+    /**
+     * 岗位类别编码
+     */
+    @Size(min = 0, max = 100, message = "类别编码长度不能超过{max}个字符")
+    private String postCategory;
+
     /**
      * 显示顺序
      */
@@ -55,5 +67,4 @@ public class SysPostBo extends BaseEntity {
      */
     private String remark;
 
-
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java

@@ -2,18 +2,18 @@ package org.dromara.system.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.system.domain.SysPost;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.system.domain.SysPost;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
-
-
 /**
  * 岗位信息视图对象 sys_post
  *
@@ -33,6 +33,12 @@ public class SysPostVo implements Serializable {
     @ExcelProperty(value = "岗位序号")
     private Long postId;
 
+    /**
+     * 部门id
+     */
+    @ExcelProperty(value = "部门id")
+    private Long deptId;
+
     /**
      * 岗位编码
      */
@@ -45,6 +51,12 @@ public class SysPostVo implements Serializable {
     @ExcelProperty(value = "岗位名称")
     private String postName;
 
+    /**
+     * 岗位类别编码
+     */
+    @ExcelProperty(value = "类别编码")
+    private String postCategory;
+
     /**
      * 显示顺序
      */
@@ -70,4 +82,10 @@ public class SysPostVo implements Serializable {
     @ExcelProperty(value = "创建时间")
     private Date createTime;
 
+    /**
+     * 部门名
+     */
+    @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId")
+    private String deptName;
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java

@@ -1,5 +1,11 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.system.domain.SysPost;
 import org.dromara.system.domain.vo.SysPostVo;
@@ -13,6 +19,12 @@ import java.util.List;
  */
 public interface SysPostMapper extends BaseMapperPlus<SysPost, SysPostVo> {
 
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "d.dept_id"),
+        @DataColumn(key = "userName", value = "p.create_by")
+    })
+    Page<SysPostVo> selectPagePostList(@Param("page") Page<SysPostVo> page, @Param(Constants.WRAPPER) Wrapper<SysPost> queryWrapper);
+
     /**
      * 查询用户所属岗位组
      *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java

@@ -14,10 +14,13 @@ import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.helper.DataBaseHelper;
+import org.dromara.system.domain.SysDept;
 import org.dromara.system.domain.SysPost;
 import org.dromara.system.domain.SysUserPost;
 import org.dromara.system.domain.bo.SysPostBo;
 import org.dromara.system.domain.vo.SysPostVo;
+import org.dromara.system.mapper.SysDeptMapper;
 import org.dromara.system.mapper.SysPostMapper;
 import org.dromara.system.mapper.SysUserPostMapper;
 import org.dromara.system.service.ISysPostService;
@@ -36,12 +39,12 @@ import java.util.List;
 public class SysPostServiceImpl implements ISysPostService {
 
     private final SysPostMapper baseMapper;
+    private final SysDeptMapper deptMapper;
     private final SysUserPostMapper userPostMapper;
 
     @Override
     public TableDataInfo<SysPostVo> selectPagePostList(SysPostBo post, PageQuery pageQuery) {
-        LambdaQueryWrapper<SysPost> lqw = buildQueryWrapper(post);
+        Page<SysPostVo> page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post));
-        Page<SysPostVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(page);
     }
 
@@ -53,17 +56,30 @@ public class SysPostServiceImpl implements ISysPostService {
      */
     @Override
     public List<SysPostVo> selectPostList(SysPostBo post) {
-        LambdaQueryWrapper<SysPost> lqw = buildQueryWrapper(post);
+        return baseMapper.selectVoList(new LambdaQueryWrapper<SysPost>()
-        return baseMapper.selectVoList(lqw);
+            .like(StringUtils.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode())
+            .like(StringUtils.isNotBlank(post.getPostCategory()), SysPost::getPostCategory, post.getPostCategory())
+            .like(StringUtils.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName())
+            .eq(StringUtils.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus())
+            .orderByAsc(SysPost::getPostSort)
+        );
     }
 
-    private LambdaQueryWrapper<SysPost> buildQueryWrapper(SysPostBo bo) {
+    private QueryWrapper<SysPost> buildQueryWrapper(SysPostBo bo) {
-        LambdaQueryWrapper<SysPost> lqw = Wrappers.lambdaQuery();
+        QueryWrapper<SysPost> wrapper = Wrappers.query();
-        lqw.like(StringUtils.isNotBlank(bo.getPostCode()), SysPost::getPostCode, bo.getPostCode());
+        wrapper.like(StringUtils.isNotBlank(bo.getPostCode()), "post_code", bo.getPostCode())
-        lqw.like(StringUtils.isNotBlank(bo.getPostName()), SysPost::getPostName, bo.getPostName());
+            .like(StringUtils.isNotBlank(bo.getPostName()), "post_name", bo.getPostName())
-        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysPost::getStatus, bo.getStatus());
+            .like(StringUtils.isNotBlank(bo.getPostCategory()), "post_category", bo.getPostCategory())
-        lqw.orderByAsc(SysPost::getPostSort);
+            .eq(StringUtils.isNotBlank(bo.getStatus()), "status", bo.getStatus())
-        return lqw;
+            .and(ObjectUtil.isNotNull(bo.getDeptId()), w -> {
+                List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
+                    .select(SysDept::getDeptId)
+                    .apply(DataBaseHelper.findInSet(bo.getDeptId(), "ancestors")));
+                List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
+                ids.add(bo.getDeptId());
+                w.in("dept_id", ids);
+            }).orderByAsc("post_sort");
+        return wrapper;
     }
 
     /**

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -7,8 +7,19 @@
     <resultMap type="org.dromara.system.domain.vo.SysPostVo" id="SysPostResult">
     </resultMap>
 
+    <select id="selectPagePostList" resultMap="SysPostResult">
+        select
+        <if test="ew.getSqlSelect != null">
+            ${ew.getSqlSelect}
+        </if>
+        <if test="ew.getSqlSelect == null">
+            *
+        </if>
+        from sys_post ${ew.getCustomSqlSegment}
+    </select>
+
     <select id="selectPostsByUserId" parameterType="Long" resultMap="SysPostResult">
-        select p.post_id, p.post_name, p.post_code
+        select p.post_id, p.post_name, p.post_code ,p.post_category
         from sys_post p
                  left join sys_user_post up on up.post_id = p.post_id
                  left join sys_user u on u.user_id = up.user_id