队伍权限

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -44,6 +44,12 @@ public class SysPostController extends BaseController {
         return postService.selectPagePostList(post);
     }
 
+    @ApiOperation("获取岗位列表所有")
+    @GetMapping("/listAll")
+    public AjaxResult<List<SysPost>> listAll(SysPost post) {
+        return AjaxResult.success(postService.selectPostList(post));
+    }
+
     @ApiOperation("导出岗位列表")
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:post:export')")

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -159,7 +159,7 @@ public class SysUser extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "岗位组")
 	@TableField(exist = false)
-	private Long[] postIds;
+	private Long postId;
 	@TableField(exist = false)
 	private String postName;
 

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GUser.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.apache.commons.codec.language.bm.Lang;
 
 /**
  * 用户对象 g_user
@@ -29,6 +30,10 @@ public class GUser extends BaseEntity {
     /**
      * 姓名
      */
+    private Long ranks;
+    /**
+     * 姓名
+     */
     private String name;
     /**
      * 工号

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GUserBo.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.codec.language.bm.Lang;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -24,7 +25,11 @@ import javax.validation.constraints.NotNull;
 public class GUserBo extends BaseEntity {
     private Long id;
 
-
+    /**
+     * 姓名
+     */
+    @ApiModelProperty(value = "队伍")
+    private Long ranks;
     /**
      * 姓名
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GUserVo.java

@@ -2,9 +2,12 @@ package com.ruoyi.gas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.codec.language.bm.Lang;
 
 
 /**
@@ -22,6 +25,13 @@ public class GUserVo {
 
 	private Long id;
 
+	/**
+	 * 姓名
+	 */
+	@ExcelProperty(value = "队伍", converter = ExcelDictConvert.class)
+	@ExcelDictFormat(dictType = "gas_user_ranks")
+	@ApiModelProperty("队伍")
+	private Long ranks;
 
     /**
      * 姓名

ruoyi-gas/src/main/resources/mapper/GUserMapper.xml

@@ -5,6 +5,7 @@
 <mapper namespace="com.ruoyi.gas.mapper.GUserMapper">
     <resultMap type="com.ruoyi.gas.domain.GUser" id="GUserResult">
         <result property="id" column="id"/>
+        <result property="ranks" column="ranks"/>
         <result property="name" column="name"/>
         <result property="jobNum" column="job_num"/>
         <result property="password" column="password"/>
@@ -20,10 +21,12 @@
     </resultMap>
     <select id="getList" resultType="com.ruoyi.gas.domain.vo.GUserVo">
         select id as id,
+        b.post_id as ranks,
         name as name,
         job_num as jobNum,
         phone as phone
         from g_user a
+        left join sys_post b on b.remark='ranks' and a.ranks = b.post_id
         <where>
             a.del_flag = '0'
             <if test="p.name != null  and p.name != ''">
@@ -32,6 +35,9 @@
             <if test="p.jobNum != null  and p.jobNum != ''">
                 and a.job_num LIKE CONCAT('%',#{p.jobNum},'%')
             </if>
+            <if test="p.ranks != null  and p.ranks != ''">
+                and a.ranks = #{p.ranks}
+            </if>
         </where>
     </select>
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -49,6 +49,7 @@ public class SysPostServiceImpl extends ServicePlusImpl<SysPostMapper, SysPost,
         return list(new LambdaQueryWrapper<SysPost>()
                 .like(StringUtils.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode())
                 .eq(StringUtils.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus())
+                .eq(StringUtils.isNotBlank(post.getRemark()), SysPost::getRemark, post.getRemark())
                 .like(StringUtils.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName()));
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -389,19 +389,12 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
      * @param user 用户对象
      */
     public void insertUserPost(SysUser user) {
-        Long[] posts = user.getPostIds();
-        if (StringUtils.isNotNull(posts)) {
+        if (StringUtils.isNotNull(user.getPostId())) {
             // 新增用户与岗位管理
-            List<SysUserPost> list = new ArrayList<SysUserPost>();
-            for (Long postId : posts) {
-                SysUserPost up = new SysUserPost();
-                up.setUserId(user.getUserId());
-                up.setPostId(postId);
-                list.add(up);
-            }
-            if (list.size() > 0) {
-                userPostMapper.insertAll(list);
-            }
+            SysUserPost up = new SysUserPost();
+            up.setUserId(user.getUserId());
+            up.setPostId(user.getPostId());
+            userPostMapper.insert(up);
         }
     }
 

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -13,6 +13,7 @@
         <result property="phonenumber" column="phonenumber"/>
         <result property="sex" column="sex"/>
         <result property="postName" column="post_name"/>
+        <result property="postId" column="post_id"/>
         <result property="avatar" column="avatar"/>
         <result property="password" column="password"/>
         <result property="status" column="status"/>
@@ -75,6 +76,7 @@
                r.role_key,
                r.role_sort,
                r.data_scope,
+               p.post_id,
                r.status as role_status
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id