qitz 2 лет назад
Родитель
Сommit
23614f7e9c

+ 5
- 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/ArbitratorController.java Просмотреть файл

1
 package com.ruoyi.web.controller.wisdomarbitrate;
1
 package com.ruoyi.web.controller.wisdomarbitrate;
2
 
2
 
3
 import com.ruoyi.common.core.controller.BaseController;
3
 import com.ruoyi.common.core.controller.BaseController;
4
+import com.ruoyi.common.core.domain.entity.SysUser;
4
 import com.ruoyi.common.core.page.TableDataInfo;
5
 import com.ruoyi.common.core.page.TableDataInfo;
6
+import com.ruoyi.system.mapper.SysUserMapper;
7
+import com.ruoyi.system.service.ISysUserService;
5
 import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
8
 import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
6
 import com.ruoyi.wisdomarbitrate.service.IArbitratorService;
9
 import com.ruoyi.wisdomarbitrate.service.IArbitratorService;
7
 import org.springframework.beans.factory.annotation.Autowired;
10
 import org.springframework.beans.factory.annotation.Autowired;
16
 @RequestMapping("/arbitrator")
19
 @RequestMapping("/arbitrator")
17
 public class ArbitratorController   extends BaseController {
20
 public class ArbitratorController   extends BaseController {
18
     @Autowired
21
     @Autowired
19
-    private IArbitratorService arbitratorService;
22
+    private ISysUserService sysUserService;
20
 
23
 
21
     /**
24
     /**
22
      * 查询仲裁员信息
25
      * 查询仲裁员信息
26
     public TableDataInfo list(Arbitrator arbitrator)
29
     public TableDataInfo list(Arbitrator arbitrator)
27
     {
30
     {
28
         startPage();
31
         startPage();
29
-        List<Arbitrator> list = arbitratorService.selectArbitratorList(arbitrator);
32
+        List<SysUser> list = sysUserService.selectUserListByAdRole(arbitrator);
30
         return getDataTable(list);
33
         return getDataTable(list);
31
     }
34
     }
32
 
35
 

+ 8
- 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java Просмотреть файл

1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
+
5
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
4
 import org.apache.ibatis.annotations.Param;
6
 import org.apache.ibatis.annotations.Param;
5
 import com.ruoyi.common.core.domain.entity.SysUser;
7
 import com.ruoyi.common.core.domain.entity.SysUser;
6
 
8
 
19
      */
21
      */
20
     public List<SysUser> selectUserList(SysUser sysUser);
22
     public List<SysUser> selectUserList(SysUser sysUser);
21
 
23
 
24
+    /**
25
+     * 查询仲裁员角色下的用户
26
+     * @return
27
+     */
28
+    public List<SysUser> selectUserListByAdRole(Arbitrator arbitrator);
29
+
22
     /**
30
     /**
23
      * 根据条件分页查询已配用户角色列表
31
      * 根据条件分页查询已配用户角色列表
24
      * 
32
      * 

+ 2
- 0
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import com.ruoyi.common.core.domain.entity.SysUser;
4
 import com.ruoyi.common.core.domain.entity.SysUser;
5
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
5
 
6
 
6
 /**
7
 /**
7
  * 用户 业务层
8
  * 用户 业务层
17
      * @return 用户信息集合信息
18
      * @return 用户信息集合信息
18
      */
19
      */
19
     public List<SysUser> selectUserList(SysUser user);
20
     public List<SysUser> selectUserList(SysUser user);
21
+    public List<SysUser> selectUserListByAdRole(Arbitrator arbitrator);
20
 
22
 
21
     /**
23
     /**
22
      * 根据条件分页查询已分配用户角色列表
24
      * 根据条件分页查询已分配用户角色列表

+ 7
- 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java Просмотреть файл

4
 import java.util.List;
4
 import java.util.List;
5
 import java.util.stream.Collectors;
5
 import java.util.stream.Collectors;
6
 import javax.validation.Validator;
6
 import javax.validation.Validator;
7
+
8
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
7
 import org.slf4j.Logger;
9
 import org.slf4j.Logger;
8
 import org.slf4j.LoggerFactory;
10
 import org.slf4j.LoggerFactory;
9
 import org.springframework.beans.factory.annotation.Autowired;
11
 import org.springframework.beans.factory.annotation.Autowired;
74
         return userMapper.selectUserList(user);
76
         return userMapper.selectUserList(user);
75
     }
77
     }
76
 
78
 
79
+    @Override
80
+    public List<SysUser> selectUserListByAdRole(Arbitrator arbitrator) {
81
+        return userMapper.selectUserListByAdRole(arbitrator);
82
+    }
83
+
77
     /**
84
     /**
78
      * 根据条件分页查询已分配用户角色列表
85
      * 根据条件分页查询已分配用户角色列表
79
      * 
86
      * 

+ 20
- 1
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml Просмотреть файл

141
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
141
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
142
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
142
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
143
 	</select>
143
 	</select>
144
-	
144
+	<select id="selectUserListByAdRole" resultMap="SysUserResult">
145
+		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
146
+		 join sys_user_role ur on ur.user_id =u.user_id
147
+		    join sys_role r on ur.role_id = r.role_id and r.role_name='仲裁员'
148
+		where r.del_flag = '0' and r.status='0'
149
+		and u.del_flag = '0' and u.status='0'
150
+			<if test="arbitratorName != null and arbitratorName != ''">
151
+				AND u.nick_name like concat('%', #{arbitratorName}, '%')
152
+			</if>
153
+
154
+			<if test="idList != null and idList.size() > 0">
155
+				AND u.user_id in
156
+				<foreach item="id" collection="idList" open="(" separator="," close=")">
157
+					#{id}
158
+				</foreach>
159
+			</if>
160
+
161
+
162
+	</select>
163
+
145
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
164
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
146
  		insert into sys_user(
165
  		insert into sys_user(
147
  			<if test="userId != null and userId != 0">user_id,</if>
166
  			<if test="userId != null and userId != 0">user_id,</if>