zyp

fs-company-app/src/main/java/com/fs/app/service/impl/AppServiceImpl.java

@@ -35,7 +35,60 @@ public class AppServiceImpl implements IAppService {
 
     @Override
     public void changeUserDeptAndPost(ChangeUserDeptAndPostParam param) {
+        log.debug("change user dept and post param: {}", JSON.toJSONString(param));
+        Set<Long> companyUserIds = Arrays.stream(param.getCompanyUserIds().split(",")).map(Long::new).collect(Collectors.toSet());
 
+        List<CompanyUser> companyUsers = companyUserService.selectCompanyUserByIds(companyUserIds);
+        if (Objects.isNull(companyUsers) || companyUsers.isEmpty()) {
+            throw new CustomException("销售不存在");
+        }
+
+        // 修改部门
+        if (Objects.nonNull(param.getDeptId())) {
+            CompanyDept companyDept = companyDeptService.selectCompanyDeptById(param.getDeptId());
+            if (Objects.isNull(companyDept)) {
+                throw new CustomException("部门不存在");
+            }
+
+            companyUsers.forEach(companyUser -> {
+                companyUser.setDeptId(param.getDeptId());
+                companyUserService.updateCompanyUser(companyUser);
+            });
+        }
+
+        // 修改岗位
+        if (StringUtils.isNotBlank(param.getPostIds())) {
+            List<Long> postIds = Arrays.stream(param.getPostIds().split(",")).map(Long::new).collect(Collectors.toList());
+            List<CompanyPost> companyPosts =  companyPostService.selectCompanyPostByIds(postIds);
+            if (Objects.nonNull(companyPosts) && !companyPosts.isEmpty()) {
+                companyUsers.forEach(companyUser -> {
+                    companyUserPostService.deleteCompanyUserPostById(companyUser.getUserId());
+                    companyUserPostService.batchInsertCompanyUserPost(companyPosts.stream().map(p -> {
+                        CompanyUserPost companyUserPost = new CompanyUserPost();
+                        companyUserPost.setPostId(p.getPostId());
+                        companyUserPost.setUserId(companyUser.getUserId());
+                        return companyUserPost;
+                    }).collect(Collectors.toList()));
+                });
+            }
+        }
+
+        // 修改角色
+        if (StringUtils.isNotBlank(param.getRoleIds())) {
+            List<Long> roleIds = Arrays.stream(param.getRoleIds().split(",")).map(Long::new).collect(Collectors.toList());
+            List<CompanyRole> CompanyRoles =  companyRoleService.selectCompanyRoleByIds(roleIds);
+            if (Objects.nonNull(CompanyRoles) && !CompanyRoles.isEmpty()) {
+                companyUsers.forEach(companyUser -> {
+                    companyUserRoleService.deleteCompanyUserRoleById(companyUser.getUserId());
+                    companyUserRoleService.batchInsertCompanyUserRole(CompanyRoles.stream().map(p -> {
+                        CompanyUserRole companyUserRole = new CompanyUserRole();
+                        companyUserRole.setRoleId(p.getRoleId());
+                        companyUserRole.setUserId(companyUser.getUserId());
+                        return companyUserRole;
+                    }).collect(Collectors.toList()));
+                });
+            }
+        }
     }
 
     /**

fs-service/src/main/java/com/fs/company/mapper/CompanyPostMapper.java

@@ -74,4 +74,13 @@ public interface CompanyPostMapper
 
     @Select("select p.post_id, p.post_name from company_user_post up inner join company_post p on p.post_id=up.post_id where up.user_id = #{userId}")
     List<CompanyPost> selectCompanyPostByUserId(@Param("userId") Long userId);
+
+
+    /**
+     * 根据ID集合查询岗位列表
+     * @param postIds   id集合
+     * @return  list
+     */
+    List<CompanyPost> selectCompanyPostByIds(@Param("postIds") List<Long> postIds);
+
 }

fs-service/src/main/java/com/fs/company/mapper/CompanyRoleMapper.java

@@ -1,20 +1,21 @@
 package com.fs.company.mapper;
 
 import com.fs.company.domain.CompanyRole;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * 角色信息Mapper接口
- * 
+ *
  * @author fs
  * @date 2021-05-25
  */
-public interface CompanyRoleMapper 
+public interface CompanyRoleMapper
 {
     /**
      * 查询角色信息
-     * 
+     *
      * @param roleId 角色信息ID
      * @return 角色信息
      */
@@ -22,7 +23,7 @@ public interface CompanyRoleMapper
 
     /**
      * 查询角色信息列表
-     * 
+     *
      * @param companyRole 角色信息
      * @return 角色信息集合
      */
@@ -30,7 +31,7 @@ public interface CompanyRoleMapper
 
     /**
      * 新增角色信息
-     * 
+     *
      * @param companyRole 角色信息
      * @return 结果
      */
@@ -38,7 +39,7 @@ public interface CompanyRoleMapper
 
     /**
      * 修改角色信息
-     * 
+     *
      * @param companyRole 角色信息
      * @return 结果
      */
@@ -46,7 +47,7 @@ public interface CompanyRoleMapper
 
     /**
      * 删除角色信息
-     * 
+     *
      * @param roleId 角色信息ID
      * @return 结果
      */
@@ -54,7 +55,7 @@ public interface CompanyRoleMapper
 
     /**
      * 批量删除角色信息
-     * 
+     *
      * @param roleIds 需要删除的数据ID
      * @return 结果
      */
@@ -69,4 +70,11 @@ public interface CompanyRoleMapper
     CompanyRole checkRoleKeyUnique(String roleKey);
 
     List<Integer> selectRoleListByUserId(Long userId);
+
+    /**
+     * 根据ID集合查询角色列表
+     * @param roleIds  ID集合
+     * @return  list
+     */
+    List<CompanyRole> selectRoleListByIds(@Param("roleIds") List<Long> roleIds);
 }

fs-service/src/main/java/com/fs/company/service/ICompanyPostService.java

@@ -6,15 +6,14 @@ import java.util.List;
 
 /**
  * 岗位信息Service接口
- * 
+ *
  * @author fs
  * @date 2021-05-25
  */
-public interface ICompanyPostService 
-{
+public interface ICompanyPostService {
     /**
      * 查询岗位信息
-     * 
+     *
      * @param postId 岗位信息ID
      * @return 岗位信息
      */
@@ -22,7 +21,7 @@ public interface ICompanyPostService
 
     /**
      * 查询岗位信息列表
-     * 
+     *
      * @param companyPost 岗位信息
      * @return 岗位信息集合
      */
@@ -30,7 +29,7 @@ public interface ICompanyPostService
 
     /**
      * 新增岗位信息
-     * 
+     *
      * @param companyPost 岗位信息
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface ICompanyPostService
 
     /**
      * 修改岗位信息
-     * 
+     *
      * @param companyPost 岗位信息
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface ICompanyPostService
 
     /**
      * 批量删除岗位信息
-     * 
+     *
      * @param postIds 需要删除的岗位信息ID
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface ICompanyPostService
 
     /**
      * 删除岗位信息信息
-     * 
+     *
      * @param postId 岗位信息ID
      * @return 结果
      */
@@ -67,4 +66,15 @@ public interface ICompanyPostService
     List<String> selectPostNameListByUserId(Long userId);
 
     List<CompanyPost> selectCompanyPostListByUserId(Long userId);
+
+
+    /**
+     * 根据id集合查询岗位列表
+     *
+     * @param postIds id集合
+     * @return list
+     */
+    List<CompanyPost> selectCompanyPostByIds(List<Long> postIds);
+
 }
+

fs-service/src/main/java/com/fs/company/service/ICompanyRoleService.java

@@ -7,15 +7,15 @@ import java.util.List;
 
 /**
  * 角色信息Service接口
- * 
+ *
  * @author fs
  * @date 2021-05-25
  */
-public interface ICompanyRoleService 
+public interface ICompanyRoleService
 {
     /**
      * 查询角色信息
-     * 
+     *
      * @param roleId 角色信息ID
      * @return 角色信息
      */
@@ -23,7 +23,7 @@ public interface ICompanyRoleService
 
     /**
      * 查询角色信息列表
-     * 
+     *
      * @param companyRole 角色信息
      * @return 角色信息集合
      */
@@ -31,7 +31,7 @@ public interface ICompanyRoleService
 
     /**
      * 新增角色信息
-     * 
+     *
      * @param companyRole 角色信息
      * @return 结果
      */
@@ -39,7 +39,7 @@ public interface ICompanyRoleService
 
     /**
      * 修改角色信息
-     * 
+     *
      * @param companyRole 角色信息
      * @return 结果
      */
@@ -47,7 +47,7 @@ public interface ICompanyRoleService
 
     /**
      * 批量删除角色信息
-     * 
+     *
      * @param roleIds 需要删除的角色信息ID
      * @return 结果
      */
@@ -55,7 +55,7 @@ public interface ICompanyRoleService
 
     /**
      * 删除角色信息信息
-     * 
+     *
      * @param roleId 角色信息ID
      * @return 结果
      */
@@ -86,4 +86,12 @@ public interface ICompanyRoleService
     public int countUserRoleByRoleId(Long roleId);
 
     List<Integer> selectRoleListByUserId(Long userId);
+
+
+    /**
+     * 根据ID集合查询角色列表
+     * @param roleIds  ID集合
+     * @return  list
+     */
+    List<CompanyRole> selectCompanyRoleByIds(List<Long> roleIds);
 }

fs-service/src/main/java/com/fs/company/service/ICompanyUserPostService.java

@@ -6,15 +6,15 @@ import java.util.List;
 
 /**
  * 用户与岗位关联Service接口
- * 
+ *
  * @author fs
  * @date 2021-05-25
  */
-public interface ICompanyUserPostService 
+public interface ICompanyUserPostService
 {
     /**
      * 查询用户与岗位关联
-     * 
+     *
      * @param userId 用户与岗位关联ID
      * @return 用户与岗位关联
      */
@@ -22,7 +22,7 @@ public interface ICompanyUserPostService
 
     /**
      * 查询用户与岗位关联列表
-     * 
+     *
      * @param companyUserPost 用户与岗位关联
      * @return 用户与岗位关联集合
      */
@@ -30,7 +30,7 @@ public interface ICompanyUserPostService
 
     /**
      * 新增用户与岗位关联
-     * 
+     *
      * @param companyUserPost 用户与岗位关联
      * @return 结果
      */
@@ -38,7 +38,7 @@ public interface ICompanyUserPostService
 
     /**
      * 修改用户与岗位关联
-     * 
+     *
      * @param companyUserPost 用户与岗位关联
      * @return 结果
      */
@@ -46,7 +46,7 @@ public interface ICompanyUserPostService
 
     /**
      * 批量删除用户与岗位关联
-     * 
+     *
      * @param userIds 需要删除的用户与岗位关联ID
      * @return 结果
      */
@@ -54,9 +54,11 @@ public interface ICompanyUserPostService
 
     /**
      * 删除用户与岗位关联信息
-     * 
+     *
      * @param userId 用户与岗位关联ID
      * @return 结果
      */
     public int deleteCompanyUserPostById(Long userId);
+
+    void batchInsertCompanyUserPost(List<CompanyUserPost> collect);
 }

fs-service/src/main/java/com/fs/company/service/ICompanyUserRoleService.java

@@ -59,4 +59,6 @@ public interface ICompanyUserRoleService
      * @return 结果
      */
     public int deleteCompanyUserRoleById(Long userId);
+
+    void batchInsertCompanyUserRole(List<CompanyUserRole> collect);
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyPostServiceImpl.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * 岗位信息Service业务层处理
- * 
+ *
  * @author fs
  * @date 2021-05-25
  */
@@ -24,7 +24,7 @@ public class CompanyPostServiceImpl implements ICompanyPostService
 
     /**
      * 查询岗位信息
-     * 
+     *
      * @param postId 岗位信息ID
      * @return 岗位信息
      */
@@ -36,7 +36,7 @@ public class CompanyPostServiceImpl implements ICompanyPostService
 
     /**
      * 查询岗位信息列表
-     * 
+     *
      * @param companyPost 岗位信息
      * @return 岗位信息
      */
@@ -48,7 +48,7 @@ public class CompanyPostServiceImpl implements ICompanyPostService
 
     /**
      * 新增岗位信息
-     * 
+     *
      * @param companyPost 岗位信息
      * @return 结果
      */
@@ -61,7 +61,7 @@ public class CompanyPostServiceImpl implements ICompanyPostService
 
     /**
      * 修改岗位信息
-     * 
+     *
      * @param companyPost 岗位信息
      * @return 结果
      */
@@ -74,7 +74,7 @@ public class CompanyPostServiceImpl implements ICompanyPostService
 
     /**
      * 批量删除岗位信息
-     * 
+     *
      * @param postIds 需要删除的岗位信息ID
      * @return 结果
      */
@@ -86,7 +86,7 @@ public class CompanyPostServiceImpl implements ICompanyPostService
 
     /**
      * 删除岗位信息信息
-     * 
+     *
      * @param postId 岗位信息ID
      * @return 结果
      */
@@ -116,4 +116,8 @@ public class CompanyPostServiceImpl implements ICompanyPostService
         return companyPostMapper.selectCompanyPostByUserId(userId);
     }
 
+    @Override
+    public List<CompanyPost> selectCompanyPostByIds(List<Long> postIds) {
+        return companyPostMapper.selectCompanyPostByIds(postIds);
+    }
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyRoleServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 /**
  * 角色信息Service业务层处理
- * 
+ *
  * @author fs
  * @date 2021-05-25
  */
@@ -37,7 +37,7 @@ public class CompanyRoleServiceImpl implements ICompanyRoleService
     private CompanyUserRoleMapper userRoleMapper;
     /**
      * 查询角色信息
-     * 
+     *
      * @param roleId 角色信息ID
      * @return 角色信息
      */
@@ -49,7 +49,7 @@ public class CompanyRoleServiceImpl implements ICompanyRoleService
 
     /**
      * 查询角色信息列表
-     * 
+     *
      * @param companyRole 角色信息
      * @return 角色信息
      */
@@ -61,7 +61,7 @@ public class CompanyRoleServiceImpl implements ICompanyRoleService
 
     /**
      * 新增角色信息
-     * 
+     *
      * @param companyRole 角色信息
      * @return 结果
      */
@@ -74,7 +74,7 @@ public class CompanyRoleServiceImpl implements ICompanyRoleService
 
     /**
      * 修改角色信息
-     * 
+     *
      * @param companyRole 角色信息
      * @return 结果
      */
@@ -87,7 +87,7 @@ public class CompanyRoleServiceImpl implements ICompanyRoleService
 
     /**
      * 批量删除角色信息
-     * 
+     *
      * @param roleIds 需要删除的角色信息ID
      * @return 结果
      */
@@ -99,7 +99,7 @@ public class CompanyRoleServiceImpl implements ICompanyRoleService
 
     /**
      * 删除角色信息信息
-     * 
+     *
      * @param roleId 角色信息ID
      * @return 结果
      */
@@ -267,4 +267,8 @@ public class CompanyRoleServiceImpl implements ICompanyRoleService
         return companyRoleMapper.selectRoleListByUserId(userId);
     }
 
+    @Override
+    public List<CompanyRole> selectCompanyRoleByIds(List<Long> roleIds) {
+        return companyRoleMapper.selectRoleListByIds(roleIds);
+    }
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserPostServiceImpl.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * 用户与岗位关联Service业务层处理
- * 
+ *
  * @author fs
  * @date 2021-05-25
  */
@@ -22,7 +22,7 @@ public class CompanyUserPostServiceImpl implements ICompanyUserPostService
 
     /**
      * 查询用户与岗位关联
-     * 
+     *
      * @param userId 用户与岗位关联ID
      * @return 用户与岗位关联
      */
@@ -34,7 +34,7 @@ public class CompanyUserPostServiceImpl implements ICompanyUserPostService
 
     /**
      * 查询用户与岗位关联列表
-     * 
+     *
      * @param companyUserPost 用户与岗位关联
      * @return 用户与岗位关联
      */
@@ -46,7 +46,7 @@ public class CompanyUserPostServiceImpl implements ICompanyUserPostService
 
     /**
      * 新增用户与岗位关联
-     * 
+     *
      * @param companyUserPost 用户与岗位关联
      * @return 结果
      */
@@ -58,7 +58,7 @@ public class CompanyUserPostServiceImpl implements ICompanyUserPostService
 
     /**
      * 修改用户与岗位关联
-     * 
+     *
      * @param companyUserPost 用户与岗位关联
      * @return 结果
      */
@@ -70,7 +70,7 @@ public class CompanyUserPostServiceImpl implements ICompanyUserPostService
 
     /**
      * 批量删除用户与岗位关联
-     * 
+     *
      * @param userIds 需要删除的用户与岗位关联ID
      * @return 结果
      */
@@ -82,7 +82,7 @@ public class CompanyUserPostServiceImpl implements ICompanyUserPostService
 
     /**
      * 删除用户与岗位关联信息
-     * 
+     *
      * @param userId 用户与岗位关联ID
      * @return 结果
      */
@@ -91,4 +91,9 @@ public class CompanyUserPostServiceImpl implements ICompanyUserPostService
     {
         return companyUserPostMapper.deleteCompanyUserPostById(userId);
     }
+
+    @Override
+    public void batchInsertCompanyUserPost(List<CompanyUserPost> companyUserPosts) {
+        companyUserPostMapper.batchUserPost(companyUserPosts);
+    }
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserRoleServiceImpl.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * 用户和角色关联Service业务层处理
- * 
+ *
  * @author fs
  * @date 2021-05-25
  */
@@ -22,7 +22,7 @@ public class CompanyUserRoleServiceImpl implements ICompanyUserRoleService
 
     /**
      * 查询用户和角色关联
-     * 
+     *
      * @param userId 用户和角色关联ID
      * @return 用户和角色关联
      */
@@ -34,7 +34,7 @@ public class CompanyUserRoleServiceImpl implements ICompanyUserRoleService
 
     /**
      * 查询用户和角色关联列表
-     * 
+     *
      * @param companyUserRole 用户和角色关联
      * @return 用户和角色关联
      */
@@ -46,7 +46,7 @@ public class CompanyUserRoleServiceImpl implements ICompanyUserRoleService
 
     /**
      * 新增用户和角色关联
-     * 
+     *
      * @param companyUserRole 用户和角色关联
      * @return 结果
      */
@@ -58,7 +58,7 @@ public class CompanyUserRoleServiceImpl implements ICompanyUserRoleService
 
     /**
      * 修改用户和角色关联
-     * 
+     *
      * @param companyUserRole 用户和角色关联
      * @return 结果
      */
@@ -70,7 +70,7 @@ public class CompanyUserRoleServiceImpl implements ICompanyUserRoleService
 
     /**
      * 批量删除用户和角色关联
-     * 
+     *
      * @param userIds 需要删除的用户和角色关联ID
      * @return 结果
      */
@@ -82,7 +82,7 @@ public class CompanyUserRoleServiceImpl implements ICompanyUserRoleService
 
     /**
      * 删除用户和角色关联信息
-     * 
+     *
      * @param userId 用户和角色关联ID
      * @return 结果
      */
@@ -91,4 +91,10 @@ public class CompanyUserRoleServiceImpl implements ICompanyUserRoleService
     {
         return companyUserRoleMapper.deleteCompanyUserRoleById(userId);
     }
+
+
+    @Override
+    public void batchInsertCompanyUserRole(List<CompanyUserRole> collect) {
+        companyUserRoleMapper.batchUserRole(collect);
+    }
 }

fs-service/src/main/resources/mapper/company/CompanyPostMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.company.mapper.CompanyPostMapper">
-    
+
     <resultMap type="CompanyPost" id="CompanyPostResult">
         <result property="postId"    column="post_id"    />
         <result property="companyId"    column="company_id"    />
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCompanyPostList" parameterType="CompanyPost" resultMap="CompanyPostResult">
         <include refid="selectCompanyPostVo"/>
-        <where>  
+        <where>
             <if test="companyId != null "> and company_id = #{companyId}</if>
             <if test="postCode != null  and postCode != ''"> and post_code = #{postCode}</if>
             <if test="postName != null  and postName != ''"> and post_name like concat('%', #{postName}, '%')</if>
@@ -32,12 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null  and status != ''"> and status = #{status}</if>
         </where>
     </select>
-    
+
     <select id="selectCompanyPostById" parameterType="Long" resultMap="CompanyPostResult">
         <include refid="selectCompanyPostVo"/>
         where post_id = #{postId}
     </select>
-        
+
     <insert id="insertCompanyPost" parameterType="CompanyPost" useGeneratedKeys="true" keyProperty="postId">
         insert into company_post
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCompanyPostByIds" parameterType="String">
-        delete from company_post where post_id in 
+        delete from company_post where post_id in
         <foreach item="postId" collection="array" open="(" separator="," close=")">
             #{postId}
         </foreach>
@@ -117,4 +117,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			 left join company_user u on u.user_id = up.user_id
 		where u.user_id = #{user_id}
 	</select>
-</mapper>
+
+    <select id="selectCompanyPostByIds" resultType="com.fs.company.domain.CompanyPost">
+        <include refid="selectCompanyPostVo"/>
+        <where>
+            <if test="postIds != null">
+                post_id in
+                <foreach collection="postIds" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
+    </select>
+</mapper>

fs-service/src/main/resources/mapper/company/CompanyRoleMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.company.mapper.CompanyRoleMapper">
-    
+
     <resultMap type="CompanyRole" id="CompanyRoleResult">
         <result property="roleId"    column="role_id"    />
         <result property="companyId"    column="company_id"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCompanyRoleList" parameterType="CompanyRole" resultMap="CompanyRoleResult">
         <include refid="selectCompanyRoleVo"/>
-        <where>  
+        <where>
             <if test="companyId != null "> and company_id = #{companyId}</if>
             <if test="roleName != null  and roleName != ''"> and role_name like concat('%', #{roleName}, '%')</if>
             <if test="roleKey != null  and roleKey != ''"> and role_key = #{roleKey}</if>
@@ -39,12 +39,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null  and status != ''"> and status = #{status}</if>
         </where>
     </select>
-    
+
     <select id="selectCompanyRoleById" parameterType="Long" resultMap="CompanyRoleResult">
         <include refid="selectCompanyRoleVo"/>
         where role_id = #{roleId}
     </select>
-        
+
     <insert id="insertCompanyRole" parameterType="CompanyRole" useGeneratedKeys="true" keyProperty="roleId">
         insert into company_role
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCompanyRoleByIds" parameterType="String">
-        delete from company_role where role_id in 
+        delete from company_role where role_id in
         <foreach item="roleId" collection="array" open="(" separator="," close=")">
             #{roleId}
         </foreach>
@@ -152,4 +152,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        left join company_user u on u.user_id = ur.user_id
 	    where u.user_id = #{userId}
 	</select>
-</mapper>
+
+    <select id="selectRoleListByIds" resultType="com.fs.company.domain.CompanyRole">
+        select * from company_role
+        where del_flag = '0' and status = '0'
+        and role_id in
+        <foreach collection="roleIds" item="roleId" separator="," open="(" close=")">
+            #{roleId}
+        </foreach>
+    </select>
+</mapper>