流程审批用户选择添加归属公司过滤

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -131,9 +131,9 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      */
     public SysUser checkEmailUnique(String email);
 
-    List<SysUser> getListByPostId(Long postId);
+    List<SysUser> getListByPostId(@Param("postId")Long postId, @Param("companyId") Long companyId);
 
-    List<SysUser> getListByRoleId(Long roleId);
+    List<SysUser> getListByRoleId(@Param("roleId")Long roleId, @Param("companyId") Long companyId);
 
     List<SysRole> getRoleByUserIdList(@Param("userIdList") List<Long> userIdList);
 
@@ -147,7 +147,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     /**
      * 根据角色id列表获取用户列表
      */
-    List<SysUser> getUserListByRoleIds(@Param("roleIdList")List<Long> roleIdList);
+    List<SysUser> getUserListByRoleIds(@Param("roleIdList") List<Long> roleIdList);
 
     /**
      * 获取用户列表

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

@@ -108,11 +108,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             Long deptId = sysUser.getDeptId();
             while (true) {
                 SysDept sysDept = sysDeptMap.get(deptId);
-                if(ObjectUtil.isEmpty(sysDept)){
+                if (ObjectUtil.isEmpty(sysDept)) {
                     break;
                 }
                 deptNameList.add(sysDept.getDeptName());
-                if(sysDept.getType()==0){
+                if (sysDept.getType() == 0) {
                     break;
                 }
                 deptId = sysDept.getParentId();
@@ -342,21 +342,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     /**
-     *赋值部门归属公司
+     * 赋值部门归属公司
      */
-    private void setUserCompanyId(SysUser user){
+    private void setUserCompanyId(SysUser user) {
         //赋值部门归属公司
         Long deptId = user.getDeptId();
-        if(ObjectUtil.isEmpty(deptId)){
+        if (ObjectUtil.isEmpty(deptId)) {
             throw new ServiceException("部门id不能为空！");
         }
         Long companyId = null;
-        while (ObjectUtil.isEmpty(companyId)){
+        while (ObjectUtil.isEmpty(companyId)) {
             SysDept sysDept = sysDeptService.getById(deptId);
-            if(ObjectUtil.isEmpty(sysDept)){
+            if (ObjectUtil.isEmpty(sysDept)) {
                 throw new ServiceException("查询不到部门信息！");
             }
-            if(sysDept.getType()!=0){
+            if (sysDept.getType() != 0) {
                 deptId = sysDept.getParentId();
                 continue;
             }
@@ -596,12 +596,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public List<SysUser> getListByPostId(Long postId) {
-        return baseMapper.getListByPostId(postId);
+        return baseMapper.getListByPostId(postId, SecurityUtils.getCompanyId());
     }
 
     @Override
     public List<SysUser> getListByRoleId(Long roleId) {
-        return baseMapper.getListByRoleId(roleId);
+        return baseMapper.getListByRoleId(roleId, SecurityUtils.getCompanyId());
     }
 
     @Override
@@ -713,8 +713,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public List<SysUser> getUserList(SysUser sysUser) {
         IWrapper<SysUser> wrapper = IWrapper.getWrapper();
-        wrapper.eq("sr",SysUser::getRoleKey,sysUser.getRoleKey());
-        wrapper.eq("sr",SysUser::getRoleId,sysUser.getRoleId());
+        wrapper.eq("sr", SysUser::getRoleKey, sysUser.getRoleKey());
+        wrapper.eq("sr", SysUser::getRoleId, sysUser.getRoleId());
         return baseMapper.getUserList(wrapper);
     }
 

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

@@ -248,6 +248,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_user_post sup
                  inner join sys_user u on sup.user_id = u.user_id
         where sup.post_id = #{postId}
+		<if test="companyId != null">
+			AND u.company_id = #{companyId}
+		</if>
     </select>
 
     <select id="getListByRoleId" resultType="com.ruoyi.common.core.domain.entity.SysUser">
@@ -272,6 +275,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_user_role sur
                  inner join sys_user u on sur.user_id = u.user_id
         where sur.role_id = #{roleId}
+		<if test="companyId != null">
+			AND u.company_id = #{companyId}
+		</if>
     </select>
     <select id="getRoleByUserIdList" resultType="com.ruoyi.common.core.domain.entity.SysRole">
         select sr.role_id, sr.role_key ,sr.role_name, sur.user_id