1

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/ArbitratorController.java

@@ -1,7 +1,10 @@
 package com.ruoyi.web.controller.wisdomarbitrate;
 
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
 import com.ruoyi.wisdomarbitrate.service.IArbitratorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +19,7 @@ import java.util.List;
 @RequestMapping("/arbitrator")
 public class ArbitratorController   extends BaseController {
     @Autowired
-    private IArbitratorService arbitratorService;
+    private ISysUserService sysUserService;
 
     /**
      * 查询仲裁员信息
@@ -26,7 +29,7 @@ public class ArbitratorController   extends BaseController {
     public TableDataInfo list(Arbitrator arbitrator)
     {
         startPage();
-        List<Arbitrator> list = arbitratorService.selectArbitratorList(arbitrator);
+        List<SysUser> list = sysUserService.selectUserListByAdRole(arbitrator);
         return getDataTable(list);
     }
 

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
@@ -19,6 +21,12 @@ public interface SysUserMapper
      */
     public List<SysUser> selectUserList(SysUser sysUser);
 
+    /**
+     * 查询仲裁员角色下的用户
+     * @return
+     */
+    public List<SysUser> selectUserListByAdRole(Arbitrator arbitrator);
+
     /**
      * 根据条件分页查询已配用户角色列表
      * 

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
 
 /**
  * 用户 业务层
@@ -17,6 +18,7 @@ public interface ISysUserService
      * @return 用户信息集合信息
      */
     public List<SysUser> selectUserList(SysUser user);
+    public List<SysUser> selectUserListByAdRole(Arbitrator arbitrator);
 
     /**
      * 根据条件分页查询已分配用户角色列表

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

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
+
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +76,11 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserList(user);
     }
 
+    @Override
+    public List<SysUser> selectUserListByAdRole(Arbitrator arbitrator) {
+        return userMapper.selectUserListByAdRole(arbitrator);
+    }
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 

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

@@ -141,6 +141,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
+	<select id="selectUserListByAdRole" 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 from sys_user u
+		 join sys_user_role ur on ur.user_id =u.user_id
+		    join sys_role r on ur.role_id = r.role_id and r.role_name='仲裁员'
+		where r.del_flag = '0' and r.status='0'
+		and u.del_flag = '0' and u.status='0'
+			<if test="arbitratorName != null and arbitratorName != ''">
+				AND u.nick_name like concat('%', #{arbitratorName}, '%')
+			</if>
+
+			<if test="idList != null and idList.size() > 0">
+				AND u.user_id in
+				<foreach item="id" collection="idList" open="(" separator="," close=")">
+					#{id}
+				</foreach>
+			</if>
+
+
+	</select>
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(