修改了经理或者事业部负责人的下拉框查询接口

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

@@ -258,10 +258,9 @@ public class SysUserController extends BaseController
     * 获取所有用户
     * 下拉框
     * */
-    @GetMapping("/getUserList")
-    public AjaxResult getUserList()
+    @GetMapping("/getUserSelectList")
+    public AjaxResult getUserList(SysUser sysUser)
     {
-        List<SysUser> sysUserList = userService.selectUserList(new SysUser());
-        return AjaxResult.success(sysUserList);
+        return AjaxResult.success(userService.selectUserSelectList(sysUser));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

 package com.ruoyi.system.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.common.core.domain.entity.SysUser;
 
 /**
@@ -203,4 +205,10 @@ public interface ISysUserService
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    /**
+     * 根据条件分页查询用户列表
+     * @return 用户信息集合信息
+     */
+    public Map<String, List<SysUser>> selectUserSelectList(SysUser user);
 }

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

 package com.ruoyi.system.service.impl;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
 import org.slf4j.Logger;
@@ -547,4 +549,27 @@ public class SysUserServiceImpl implements ISysUserService
         }
         return successMsg.toString();
     }
+
+    @Override
+    public Map<String, List<SysUser>> selectUserSelectList(SysUser user) {
+        // 查询出所有用户
+        List<SysUser> sysUsers = userMapper.selectUserList(user);
+        // 提取出sysUsers中每一个对象的roles数组中包含roleName等于事业部负责人的用户，变成一个新的map集合，key为fuzeren，value为List集合
+        // 过滤出角色中为"事业部负责人"的用户
+        List<SysUser> businessHeaderList = sysUsers.stream()
+                .filter(sysUser -> sysUser.getRoles().stream()
+                        .anyMatch(role -> "head-of-business-department".equals(role.getRoleKey())))
+                .collect(Collectors.toList());
+        // 构造新的 Map 集合
+        Map<String, List<SysUser>> resultMap = new HashMap<>();
+        resultMap.put("headerList", businessHeaderList);
+
+        // 过滤出角色中为"项目经理"的用户
+        List<SysUser> businessManagerList = sysUsers.stream()
+                .filter(sysUser -> sysUser.getRoles().stream()
+                        .anyMatch(role -> "project-manager".equals(role.getRoleKey())))
+                .collect(Collectors.toList());
+        resultMap.put("managerList", businessManagerList);
+        return resultMap;
+    }
 }

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

@@ -57,8 +57,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id,
+		       u.dept_id,
+		       u.nick_name,
+		       u.user_name,
+		       u.email,
+		       u.avatar,
+		       u.phonenumber,
+		       u.sex,
+		       u.status,
+		       u.del_flag,
+		       u.login_ip,
+		       u.login_date,
+		       u.create_by,
+		       u.create_time,
+		       u.remark,
+		       d.dept_name,
+		       d.leader,
+		       sr.role_id,
+		       sr.role_name,
+		       sr.role_key
+		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
+		left join sys_user_role sur on u.user_id = sur.user_id
+		left join sys_role sr on sur.role_id = sr.role_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
@@ -217,5 +239,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			#{userId}
         </foreach>
  	</delete>
-	
 </mapper>