From ddfe612c8e52a7d2dcbc32ec3b7f8a49497d0e1f Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Tue, 4 Jan 2022 22:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E9=97=A8=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=80=89=E6=8B=A9=E6=97=B6=EF=BC=8C=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=83=A8=E9=97=A8=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=B8=8E?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../role/IRoleDepartmentUserBaseService.java  |  11 ++
 .../interfaces/user/IUserBaseService.java     |  21 +++
 .../IRoleDepartmentUserRemoteService.java     |  28 ++++
 .../impl/RoleDepartmentUserServiceImpl.java   |  16 +-
 .../service/user/impl/UserServiceImpl.java    |  14 ++
 .../route/DepartmentUserRouteController.java  |   9 +-
 .../service/IDepartmentUserService.java       |  36 +++++
 .../impl/DepartmentUserServiceImpl.java       |  36 ++---
 .../department/user/select-user.html          | 140 ++++++++++++++----
 .../api/RoleDepartmentUserController.java     |  19 +++
 .../RoleDepartmentUserResourceController.java |  51 +++++++
 .../impl/RoleDepartmentUserServiceImpl.java   |  73 +++++++++
 .../main/resources/templates/role/list.html   |   1 +
 .../user/service/impl/UserServiceImpl.java    |  20 +++
 14 files changed, 420 insertions(+), 55 deletions(-)
 create mode 100644 login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/role/IRoleDepartmentUserRemoteService.java
 create mode 100644 service-role/src/main/java/ink/wgink/service/role/controller/resources/RoleDepartmentUserResourceController.java

diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleDepartmentUserBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleDepartmentUserBaseService.java
index bd3d6609..22100ab7 100644
--- a/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleDepartmentUserBaseService.java
+++ b/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleDepartmentUserBaseService.java
@@ -1,6 +1,8 @@
 package ink.wgink.interfaces.role;
 
+import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.dtos.department.DepartmentUserDTO;
+import ink.wgink.pojo.result.SuccessResultList;
 
 import java.util.List;
 
@@ -32,4 +34,13 @@ public interface IRoleDepartmentUserBaseService {
      */
     List<DepartmentUserDTO> listUserByDepartmentIdAndRoleId(String departmentId, String roleId);
 
+    /**
+     * 用户分页列表
+     *
+     * @param departmentId 部门ID
+     * @param roleId       角色ID
+     * @param page         分页参数
+     * @return
+     */
+    SuccessResultList<List<DepartmentUserDTO>> listPageUserByDepartmentIdAndRoleId(String departmentId, String roleId, ListPage page);
 }
diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/user/IUserBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/user/IUserBaseService.java
index ccdcda1c..4f0afbd6 100644
--- a/basic-interface/src/main/java/ink/wgink/interfaces/user/IUserBaseService.java
+++ b/basic-interface/src/main/java/ink/wgink/interfaces/user/IUserBaseService.java
@@ -95,6 +95,16 @@ public interface IUserBaseService {
      */
     SuccessResultList<List<UserDTO>> listPageByExcludeIds(List<String> excludeUserIds, ListPage page);
 
+    /**
+     * 不包含与包含的用户分页列表
+     *
+     * @param excludeUserIds 不包含用户id列表
+     * @param includeUserIds 包含的用户id列表
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<UserDTO>> listPageByExcludeIdsAndIncludeIds(List<String> excludeUserIds, List<String> includeUserIds, ListPage page);
+
     /**
      * 不包含的用户分页列表
      *
@@ -104,6 +114,16 @@ public interface IUserBaseService {
      */
     List<UserDTO> listByExcludeIds(List<String> excludeUserIds, Map<String, Object> params);
 
+    /**
+     * 不包含和包含的用户分页列表
+     *
+     * @param excludeUserIds 不包含用户ID列表
+     * @param includeUserIds 包含用户ID列表
+     * @param params
+     * @return
+     */
+    List<UserDTO> listByExcludeIds(List<String> excludeUserIds, List<String> includeUserIds, Map<String, Object> params);
+
 
     /**
      * 用户统计
@@ -167,4 +187,5 @@ public interface IUserBaseService {
      * @return
      */
     List<String> listUserIds(List<UserDTO> userDTOs);
+
 }
diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/role/IRoleDepartmentUserRemoteService.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/role/IRoleDepartmentUserRemoteService.java
new file mode 100644
index 00000000..5679faff
--- /dev/null
+++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/role/IRoleDepartmentUserRemoteService.java
@@ -0,0 +1,28 @@
+package ink.wgink.login.oauth2.client.remote.role;
+
+import ink.wgink.annotation.rpc.rest.RemoteService;
+import ink.wgink.annotation.rpc.rest.method.RemoteGetMethod;
+import ink.wgink.annotation.rpc.rest.params.RemotePathParams;
+import ink.wgink.annotation.rpc.rest.params.RemoteQueryParams;
+import ink.wgink.annotation.rpc.rest.params.RemoteQueryParamsMap;
+import ink.wgink.annotation.rpc.rest.params.RemoteServerParams;
+import ink.wgink.pojo.dtos.department.DepartmentUserDTO;
+import ink.wgink.pojo.result.SuccessResultList;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: IRoleDepartmentUserRemoteService
+ * @Description: 角色部门用户列表
+ * @Author: wanggeng
+ * @Date: 2022/1/4 6:33 PM
+ * @Version: 1.0
+ */
+@RemoteService("/resource/role/department/user")
+public interface IRoleDepartmentUserRemoteService {
+
+    @RemoteGetMethod("listpage-user/{departmentId}/{roleId}")
+    SuccessResultList<List<DepartmentUserDTO>> listPageUserByDepartmentIdAndRoleId(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemotePathParams("departmentId") String departmentId, @RemotePathParams("roleId") String roleId, @RemoteQueryParams("page") int page, @RemoteQueryParams("page") int rows, @RemoteQueryParamsMap Map<String, Object> params);
+
+}
diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/role/impl/RoleDepartmentUserServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/role/impl/RoleDepartmentUserServiceImpl.java
index b43093e4..3cea9640 100644
--- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/role/impl/RoleDepartmentUserServiceImpl.java
+++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/role/impl/RoleDepartmentUserServiceImpl.java
@@ -3,10 +3,15 @@ package ink.wgink.login.oauth2.client.service.role.impl;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.interfaces.department.IDepartmentBaseService;
 import ink.wgink.interfaces.department.IDepartmentUserBaseService;
+import ink.wgink.login.oauth2.client.remote.role.IRoleDepartmentUserRemoteService;
 import ink.wgink.login.oauth2.client.service.role.IRoleDepartmentUserService;
 import ink.wgink.login.oauth2.client.service.role.IRoleUserService;
+import ink.wgink.module.oauth2.manager.OAuth2ClientTokenManager;
+import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.dtos.department.DepartmentUserDTO;
 import ink.wgink.pojo.pos.DepartmentPO;
+import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.properties.ApiPathProperties;
 import ink.wgink.util.ArrayListUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,14 +30,16 @@ import java.util.List;
 @Service
 public class RoleDepartmentUserServiceImpl extends DefaultBaseService implements IRoleDepartmentUserService {
 
-    @Autowired
-    private IRoleUserService userService;
     @Autowired
     private IRoleUserService roleUserService;
     @Autowired
     private IDepartmentBaseService departmentBaseService;
     @Autowired
     private IDepartmentUserBaseService departmentUserBaseService;
+    @Autowired
+    private IRoleDepartmentUserRemoteService roleDepartmentUserRemoteService;
+    @Autowired
+    private ApiPathProperties apiPathProperties;
 
     @Override
     public List<DepartmentUserDTO> listUserByRoleIdAndAreaCode(String roleId, String areaCode) {
@@ -68,6 +75,11 @@ public class RoleDepartmentUserServiceImpl extends DefaultBaseService implements
         return departmentUserDTOs;
     }
 
+    @Override
+    public SuccessResultList<List<DepartmentUserDTO>> listPageUserByDepartmentIdAndRoleId(String departmentId, String roleId, ListPage page) {
+        return roleDepartmentUserRemoteService.listPageUserByDepartmentIdAndRoleId(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), departmentId, roleId, page.getPage(), page.getRows(), page.getParams());
+    }
+
     /**
      * 清除没有角色的用户
      *
diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/user/impl/UserServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/user/impl/UserServiceImpl.java
index 00bc44ac..69f0f473 100644
--- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/user/impl/UserServiceImpl.java
+++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/user/impl/UserServiceImpl.java
@@ -86,12 +86,26 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService
         return userRemoteService.listPage(apiPathProperties.getUserCenter(), page.getPage(), page.getRows(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getParams());
     }
 
+    @Override
+    public SuccessResultList<List<UserDTO>> listPageByExcludeIdsAndIncludeIds(List<String> excludeUserIds, List<String> includeUserIds, ListPage page) {
+        page.getParams().put("excludeUserIds", excludeUserIds);
+        page.getParams().put("userIds", includeUserIds);
+        return userRemoteService.listPage(apiPathProperties.getUserCenter(), page.getPage(), page.getRows(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getParams());
+    }
+
     @Override
     public List<UserDTO> listByExcludeIds(List<String> excludeUserIds, Map<String, Object> params) {
         params.put("excludeUserIds", excludeUserIds);
         return userRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
     }
 
+    @Override
+    public List<UserDTO> listByExcludeIds(List<String> excludeUserIds, List<String> includeUserIds, Map<String, Object> params) {
+        params.put("excludeUserIds", excludeUserIds);
+        params.put("userIds", excludeUserIds);
+        return userRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
+    }
+
     @Override
     public int countDateRange(String startDate, String endDate) {
         SuccessResultData<Integer> successResultData = userRemoteService.countDateRange(apiPathProperties.getUserCenter(), startDate, endDate, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentUserRouteController.java b/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentUserRouteController.java
index c3979e6b..eb7cc937 100644
--- a/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentUserRouteController.java
+++ b/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentUserRouteController.java
@@ -1,7 +1,9 @@
 package ink.wgink.service.department.controller.route;
 
 import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.interfaces.role.IRoleBaseService;
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,6 +24,9 @@ import org.springframework.web.servlet.ModelAndView;
 @RequestMapping(ISystemConstant.ROUTE_PREFIX + "/department/user")
 public class DepartmentUserRouteController {
 
+    @Autowired(required = false)
+    private IRoleBaseService roleBaseService;
+
     @GetMapping("list")
     public ModelAndView list() {
         return new ModelAndView("department/user/list");
@@ -29,7 +34,9 @@ public class DepartmentUserRouteController {
 
     @GetMapping("select-user")
     public ModelAndView selectUser() {
-        return new ModelAndView("department/user/select-user");
+        ModelAndView modelAndView = new ModelAndView("department/user/select-user");
+        modelAndView.addObject("hasRoleService", (roleBaseService != null));
+        return modelAndView;
     }
 
 }
diff --git a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java
index d10fb04d..68fc1c1f 100644
--- a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java
+++ b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java
@@ -3,7 +3,9 @@ package ink.wgink.service.department.service;
 import ink.wgink.interfaces.department.IDepartmentUserBaseService;
 import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO;
 import ink.wgink.pojo.dtos.department.DepartmentUserDTO;
+import ink.wgink.pojo.dtos.user.UserDTO;
 import ink.wgink.pojo.pos.DepartmentPO;
+import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.service.department.pojo.vos.DepartmentUserSortVO;
 
 import java.util.List;
@@ -71,6 +73,14 @@ public interface IDepartmentUserService extends IDepartmentUserBaseService {
      */
     void updateSort(String departmentId, DepartmentUserSortVO departmentUserSortVO);
 
+    /**
+     *
+     * @param departmentId
+     * @param userIds
+     * @return
+     */
+    List<DepartmentUserDTO> listByDepartmentIdAndUserIds(String departmentId, List<String> userIds);
+
     /**
      * 部门列表
      *
@@ -95,4 +105,30 @@ public interface IDepartmentUserService extends IDepartmentUserBaseService {
      */
     List<DepartmentUserDTO> listWithUser(Map<String, Object> params);
 
+    /**
+     * 机构用户分页列表
+     *
+     * @param successResultList
+     * @return
+     */
+    SuccessResultList<List<DepartmentUserDTO>> listPageExcludeDepartmentUser(SuccessResultList<List<UserDTO>> successResultList);
+
+    /**
+     * 机构用户分页列表
+     *
+     * @param userDTOs
+     * @return
+     */
+    List<DepartmentUserDTO> listExcludeDepartmentUser(List<UserDTO> userDTOs);
+
+    /**
+     * 机构用户分页列表
+     *
+     * @param successResultList
+     * @param hasDepartmentUsers
+     * @return
+     */
+    SuccessResultList<List<DepartmentUserDTO>> listPageDepartmentUser(SuccessResultList<List<UserDTO>> successResultList, List<DepartmentUserDTO> hasDepartmentUsers);
+
+
 }
diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java
index ed29689d..dffe65e8 100644
--- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java
+++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java
@@ -168,6 +168,14 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe
         return list(params);
     }
 
+    @Override
+    public List<DepartmentUserDTO> listByDepartmentIdAndUserIds(String departmentId, List<String> userIds) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("departmentId", departmentId);
+        params.put("userIds", userIds);
+        return list(params);
+    }
+
     @Override
     public List<DepartmentUserDTO> list(List<String> departmentIds) {
         Map<String, Object> params = getHashMap(2);
@@ -304,26 +312,16 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe
         return listDepartmentUser(userDTOs, hasDepartmentUsers);
     }
 
-    /**
-     * 机构用户分页列表
-     *
-     * @param successResultList
-     * @return
-     */
-    private SuccessResultList<List<DepartmentUserDTO>> listPageExcludeDepartmentUser(SuccessResultList<List<UserDTO>> successResultList) {
+    @Override
+    public SuccessResultList<List<DepartmentUserDTO>> listPageExcludeDepartmentUser(SuccessResultList<List<UserDTO>> successResultList) {
         // 查询用户排序
         List<UserDTO> userDTOs = successResultList.getRows();
         List<DepartmentUserDTO> departmentUserDTOs = listExcludeDepartmentUser(userDTOs);
         return new SuccessResultList<>(departmentUserDTOs, successResultList.getPage(), successResultList.getTotal());
     }
 
-    /**
-     * 机构用户分页列表
-     *
-     * @param userDTOs
-     * @return
-     */
-    private List<DepartmentUserDTO> listExcludeDepartmentUser(List<UserDTO> userDTOs) {
+    @Override
+    public List<DepartmentUserDTO> listExcludeDepartmentUser(List<UserDTO> userDTOs) {
         // 查询用户排序
         List<DepartmentUserDTO> departmentUserDTOs = new ArrayList<>();
         for (UserDTO userDTO : userDTOs) {
@@ -335,14 +333,8 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe
         return departmentUserDTOs;
     }
 
-    /**
-     * 机构用户分页列表
-     *
-     * @param successResultList
-     * @param hasDepartmentUsers
-     * @return
-     */
-    private SuccessResultList<List<DepartmentUserDTO>> listPageDepartmentUser(SuccessResultList<List<UserDTO>> successResultList, List<DepartmentUserDTO> hasDepartmentUsers) {
+    @Override
+    public SuccessResultList<List<DepartmentUserDTO>> listPageDepartmentUser(SuccessResultList<List<UserDTO>> successResultList, List<DepartmentUserDTO> hasDepartmentUsers) {
         // 查询用户排序
         List<UserDTO> userDTOs = successResultList.getRows();
         List<DepartmentUserDTO> departmentUserDTOs = listDepartmentUser(userDTOs, hasDepartmentUsers);
diff --git a/service-department/src/main/resources/templates/department/user/select-user.html b/service-department/src/main/resources/templates/department/user/select-user.html
index fb45baa7..e1e1d0ce 100644
--- a/service-department/src/main/resources/templates/department/user/select-user.html
+++ b/service-department/src/main/resources/templates/department/user/select-user.html
@@ -10,9 +10,21 @@
     <link rel="stylesheet" type="text/css" href="assets/js/vendor/zTree3/css/metroStyle/metroStyle.css"/>
     <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
-    <style>
+    <style th:if="${hasRoleService eq true}">
         .user-search {width: 188px !important; display: inline;}
+        .user-search-role {width: 105px !important; display: inline;}
         .user-selected {border-left: 2px solid #009688 !important;}
+        .user-selected-avatar {float: left; margin: 5px; width: 40px !important; height: 40px !important;}
+        .user-selected-span {float:left; display: block; width: 120px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
+        .tree-title {margin: 0px 2px 0px 4px; padding: 7px 5px 7px 5px; background: #f1f1f1; font-weight: bold;}
+    </style>
+    <style th:if="${hasRoleService eq false}">
+        .user-search {width: 188px !important; display: inline;}
+        .user-search-role {width: 188px !important; display: inline;}
+        .user-selected {border-left: 2px solid #009688 !important;}
+        .user-selected-avatar {float: left; margin: 5px; width: 40px !important; height: 40px !important;}
+        .user-selected-span {float:left; display: block; width: 188px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
+        .tree-title {margin: 0px 2px 0px 4px; padding: 7px 5px 7px 5px; background: #f1f1f1; font-weight: bold;}
     </style>
 </head>
 <body>
@@ -25,15 +37,42 @@
                 </div>
             </div>
             <div class="layui-row">
-                <div class="layui-col-xs5">
+                <div class="layui-col-xs3" th:if="${hasRoleService eq true}">
+                    <div class="tree-title">角色树</div>
                     <div class="selector-tree-wrapper">
-                        <ul id="leftTree" class="ztree"></ul>
+                        <ul id="roleTree" class="ztree"></ul>
                     </div>
                 </div>
-                <div class="layui-col-xs7">
+                <div class="layui-col-xs4" th:if="${hasRoleService eq true}">
+                    <div class="tree-title">组织机构树</div>
+                    <div class="selector-tree-wrapper">
+                        <ul id="departmentTree" class="ztree"></ul>
+                    </div>
+                </div>
+                <div class="layui-col-xs5" th:if="${hasRoleService eq false}">
+                    <div class="tree-title">组织机构树</div>
+                    <div class="selector-tree-wrapper">
+                        <ul id="departmentTree" class="ztree"></ul>
+                    </div>
+                </div>
+                <div class="layui-col-xs5" th:if="${hasRoleService eq true}">
                     <div class="selector-body-wrapper">
                         <div class="selector-body-search">
-                            <input type="text" id="searchUser" class="layui-input user-search" placeholder="快捷检索当前列表"/>
+                            <input type="text" id="searchUser" class="layui-input user-search-role" placeholder="快捷检索当前列表"/>
+                            <div class="layui-btn-group">
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-click-select-all-user>全选</button>
+                                <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-click-clear-all-user>清空</button>
+                            </div>
+                        </div>
+                        <div id="users" class="selector-body-content list-group">
+                            <div id="userWrapper"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-xs7" th:if="${hasRoleService eq false}">
+                    <div class="selector-body-wrapper">
+                        <div class="selector-body-search">
+                            <input type="text" id="searchUser" class="layui-input user-search-role" placeholder="快捷检索当前列表"/>
                             <div class="layui-btn-group">
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-click-select-all-user>全选</button>
                                 <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-click-clear-all-user>清空</button>
@@ -57,7 +96,7 @@
     </div>
 </div>
 <script src="assets/layuiadmin/layui/layui.js"></script>
-<script>
+<script th:inline="javascript">
     layui.config({
         base: 'assets/layuiadmin/'
     }).extend({
@@ -70,8 +109,10 @@
         var selectedUserIds = top.dialog.dialogData.selectedUserIds;
         var selectDepartmentUserOldArray = [];
         var selectDepartmentUserArray = [];
+        var selectRoleId = 0;
         var selectedParentId = 0;
         var searchTimeout;
+        var hasRoleService = [[${hasRoleService}]];
         top.dialog.dialogData.selectedDepartmentUsers = [];
 
         function closeBox() {
@@ -80,7 +121,7 @@
         function initFrame() {
             var height = $win.height() - 160;
             $('.selector-tree-wrapper').css({
-                height: height +'px',
+                height: (height - 38) +'px',
                 border: '1px dotted silver'
             });
             $('.selector-body-wrapper').css({
@@ -91,8 +132,46 @@
                 height: ($('.selector-body-wrapper').height() - 30) +'px'
             });
         }
-        // 初始化树
-        function initThree() {
+        // 初始化角色树
+        function initRoleTree() {
+            var setting = {
+                async: {
+                    enable: true,
+                    autoLoad: false,
+                    type: 'get',
+                    url: top.restAjax.path('api/role/listztree', []),
+                    autoParam:['id'],
+                    otherParam:{},
+                    dataFilter: function(treeId, parentNode, childNodes) {
+                        if (!childNodes) return null;
+                        for (var i=0, l=childNodes.length; i<l; i++) {
+                            childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+                        }
+                        return childNodes;
+                    }
+                },
+                callback: {
+                    onClick: function(event, treeId, treeNode) {
+                        if(treeNode.id == 0) {
+                            selectRoleId = undefined;
+                        } else {
+                            selectRoleId = treeNode.id;
+                        }
+                        $('#searchUser').val('');
+                        initUsers(selectedParentId);
+                        return false;
+                    }
+                },
+                view: {
+                    fontCss: {'color': 'black'}
+                }
+            };
+            var zTree = $.fn.zTree.init($('#roleTree'), setting);
+            zTree.addNodes(null, {id: '0', pId: '-1', name: '无角色', url: 'javascript:void(0);', isParent: 'false'});
+            common.refreshTree('roleTree');
+        }
+        // 初始化部门树
+        function initDepartmentTree() {
             var setting = {
                 async: {
                     enable: true,
@@ -111,6 +190,7 @@
                 },
                 callback: {
                     onClick: function(event, treeId, treeNode) {
+                        var parentId;
                         if(treeNode.id == 0) {
                             return;
                         } else if(treeNode.id == 1) {
@@ -127,22 +207,17 @@
                     fontCss: {'color': 'black'}
                 }
             };
-            var zTree = $.fn.zTree.init($('#leftTree'), setting);
+            var zTree = $.fn.zTree.init($('#departmentTree'), setting);
             zTree.addNodes(null, {id: '1', pId: '-1', name: '自由用户', url: 'javascript:void(0);', isParent: 'false'});
             zTree.addNodes(null, {id: '0', pId: '-1', name: '组织部门', url: 'javascript:void(0);', isParent: 'true'});
-            common.refreshTree('leftTree');
+            common.refreshTree('departmentTree');
         }
         // 添加人员dom
         function addUserDom(data) {
             var userDom = '';
             for(var i = 0, item; item = data[i++];) {
-                var avatarDom;
-                if(null == item.userAvatar || '' == item.userAvatar) {
-                    avatarDom = '<img class="user-avatar" src="assets/images/profile-photo.jpg"/> '
-                } else {
-                    avatarDom = '<img class="user-avatar" src="route/file/download/false/'+ item.userAvatar +'"/> ';
-                }
-                userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'" data-user-username="'+ item.userUsername +'">'+ avatarDom + item.userName +' ['+ item.userUsername +']</a>';
+                var avatarDom = '<img class="user-avatar user-selected-avatar" src="assets/images/profile-photo.jpg"/> ';
+                userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'" data-user-username="'+ item.userUsername +'">'+ avatarDom +'<span class="user-selected-span">'+ item.userUsername +'</span><span class="user-selected-span">昵称：'+ item.userName +'</span></a>';
             }
             $('#userWrapper').append(userDom);
         }
@@ -163,13 +238,8 @@
             }
             var userDom = '';
             for(var i = 0, item; item = data[i++];) {
-                var avatarDom;
-                if(item.userAvatar) {
-                    avatarDom = '<img class="user-avatar" src="assets/images/profile-photo.jpg"/> '
-                } else {
-                    avatarDom = '<img class="user-avatar" src="route/file/download/false/'+ item.userAvatar +'"/> ';
-                }
-                userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users search-users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'" data-user-username="'+ item.userUsername +'">'+ avatarDom + item.userName +' ['+ item.userUsername +']</a>';
+                var avatarDom = '<img class="user-avatar user-selected-avatar" src="assets/images/profile-photo.jpg"/> '
+                userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users search-users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'" data-user-username="'+ item.userUsername +'">'+ avatarDom +'<span class="user-selected-span">'+ item.userUsername +'</span><span class="user-selected-span">昵称：'+ item.userName +'</span></a>';
             }
             $('#userWrapper').append(userDom);
         }
@@ -181,7 +251,11 @@
                 isAuto: false,
                 done: function(page, next) {
                     var loadLayerIndex;
-                    top.restAjax.get(top.restAjax.path('api/department/user/listpage/{department}', [selectedParentId]), {
+                    var url = top.restAjax.path('api/department/user/listpage/{department}', [selectedParentId]);
+                    if(selectRoleId) {
+                        url = top.restAjax.path('api/role/department/user/listpage-user/{department}/{roleId}', [selectedParentId, selectRoleId]);
+                    }
+                    top.restAjax.get(url, {
                         page: page,
                         rows: 20
                     }, null, function(code, data) {
@@ -201,10 +275,13 @@
                 return;
             }
             var loadLayerIndex;
-            top.restAjax.get(top.restAjax.path('api/department/user/list/{department}', [selectedParentId]), {
+            var url = top.restAjax.path('api/department/user/list/{department}', [selectedParentId]);
+            if(selectRoleId) {
+                url = top.restAjax.path('api/role/department/user/list-user/{department}/{roleId}', [selectedParentId, selectRoleId]);
+            }
+            top.restAjax.get(url, {
                 keywords: searchUser
             }, null, function(code, data) {
-                console.log(data);
                 addSearchUserDom(data);
             }, function(code, data) {
                 top.dialog.msg(data.msg);
@@ -216,9 +293,9 @@
         }
         // 初始化人员列表
         function initUsers(parentId) {
-            selectedParentId = parentId;
             $('#userWrapper').empty();
             $('.layui-flow-more').remove();
+            selectedParentId = parentId;
             initUserFlowLoad();
         }
         // 初始化选择的人员
@@ -249,7 +326,10 @@
             });
         }
         initFrame();
-        initThree();
+        if(hasRoleService) {
+            initRoleTree();
+        }
+        initDepartmentTree();
         initSelectedUsers(function() {
             initUsers(0);
         });
diff --git a/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleDepartmentUserController.java b/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleDepartmentUserController.java
index 2e4edbad..7214d96b 100644
--- a/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleDepartmentUserController.java
+++ b/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleDepartmentUserController.java
@@ -2,8 +2,10 @@ package ink.wgink.service.role.controller.api;
 
 import ink.wgink.common.base.DefaultBaseController;
 import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.dtos.department.DepartmentUserDTO;
 import ink.wgink.pojo.result.ErrorResult;
+import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.service.role.service.IRoleDepartmentUserService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: RoleDepartmentUserController
@@ -53,4 +56,20 @@ public class RoleDepartmentUserController extends DefaultBaseController {
         return roleDepartmentUserService.listUserByDepartmentIdAndRoleId(departmentId, roleId);
     }
 
+    @ApiOperation(value = "用户分页列表", notes = "通过部门ID、角色ID用户列表接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path"),
+            @ApiImplicitParam(name = "roleId", value = "角色ID", paramType = "path"),
+            @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
+            @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
+            @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("listpage-user/{departmentId}/{roleId}")
+    public SuccessResultList<List<DepartmentUserDTO>> listPageUserByDepartmentIdAndRoleId(@PathVariable("departmentId") String departmentId, @PathVariable("roleId") String roleId, ListPage page) {
+        Map<String, Object> params = requestParams();
+        page.setParams(params);
+        return roleDepartmentUserService.listPageUserByDepartmentIdAndRoleId(departmentId, roleId, page);
+    }
+
 }
diff --git a/service-role/src/main/java/ink/wgink/service/role/controller/resources/RoleDepartmentUserResourceController.java b/service-role/src/main/java/ink/wgink/service/role/controller/resources/RoleDepartmentUserResourceController.java
new file mode 100644
index 00000000..a16d7462
--- /dev/null
+++ b/service-role/src/main/java/ink/wgink/service/role/controller/resources/RoleDepartmentUserResourceController.java
@@ -0,0 +1,51 @@
+package ink.wgink.service.role.controller.resources;
+
+import ink.wgink.common.base.DefaultBaseController;
+import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.dtos.department.DepartmentUserDTO;
+import ink.wgink.pojo.result.ErrorResult;
+import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.service.role.service.IRoleDepartmentUserService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: RoleDepartmentUserResourceController
+ * @Description: 角色部门用户
+ * @Author: wanggeng
+ * @Date: 2021/11/3 3:04 下午
+ * @Version: 1.0
+ */
+@Api(tags = ISystemConstant.API_TAGS_RESOURCE_PREFIX + "角色部门用户")
+@RestController
+@RequestMapping(ISystemConstant.RESOURCE_PREFIX + "/role/department/user")
+public class RoleDepartmentUserResourceController extends DefaultBaseController {
+
+    @Autowired
+    private IRoleDepartmentUserService roleDepartmentUserService;
+
+    @ApiOperation(value = "用户分页列表", notes = "通过部门ID、角色ID用户列表接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path"),
+            @ApiImplicitParam(name = "roleId", value = "角色ID", paramType = "path"),
+            @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
+            @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
+            @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("listpage-user/{departmentId}/{roleId}")
+    public SuccessResultList<List<DepartmentUserDTO>> listPageUserByDepartmentIdAndRoleId(@PathVariable("departmentId") String departmentId, @PathVariable("roleId") String roleId, ListPage page) {
+        Map<String, Object> params = requestParams();
+        page.setParams(params);
+        return roleDepartmentUserService.listPageUserByDepartmentIdAndRoleId(departmentId, roleId, page);
+    }
+
+}
diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleDepartmentUserServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleDepartmentUserServiceImpl.java
index aa13cf17..02024aec 100644
--- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleDepartmentUserServiceImpl.java
+++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleDepartmentUserServiceImpl.java
@@ -1,12 +1,17 @@
 package ink.wgink.service.role.service.impl;
 
 import ink.wgink.common.base.DefaultBaseService;
+import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.dtos.department.DepartmentUserDTO;
+import ink.wgink.pojo.dtos.user.UserDTO;
 import ink.wgink.pojo.pos.DepartmentPO;
+import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.service.department.service.IDepartmentService;
 import ink.wgink.service.department.service.IDepartmentUserService;
 import ink.wgink.service.role.service.IRoleDepartmentUserService;
 import ink.wgink.service.role.service.IRoleUserService;
+import ink.wgink.service.user.service.IUserService;
 import ink.wgink.util.ArrayListUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +33,8 @@ public class RoleDepartmentUserServiceImpl extends DefaultBaseService implements
     @Autowired
     private IRoleUserService roleUserService;
     @Autowired
+    private IUserService userService;
+    @Autowired
     private IDepartmentService departmentService;
     @Autowired
     private IDepartmentUserService departmentUserService;
@@ -54,6 +61,21 @@ public class RoleDepartmentUserServiceImpl extends DefaultBaseService implements
 
     @Override
     public List<DepartmentUserDTO> listUserByDepartmentIdAndRoleId(String departmentId, String roleId) {
+        if (StringUtils.equals(departmentId, ISystemConstant.TREE_BASE_ROOT_ID_VALUE)) {
+            return listUserByExcludeDepartment(roleId);
+        }
+        return listUser(departmentId, roleId);
+    }
+
+    @Override
+    public SuccessResultList<List<DepartmentUserDTO>> listPageUserByDepartmentIdAndRoleId(String departmentId, String roleId, ListPage page) {
+        if (StringUtils.equals(departmentId, ISystemConstant.TREE_BASE_ROOT_ID_VALUE)) {
+            return listPageUserByExcludeDepartment(roleId, page);
+        }
+        return listPageUser(departmentId, roleId, page);
+    }
+
+    private List<DepartmentUserDTO> listUser(String departmentId, String roleId) {
         List<DepartmentUserDTO> departmentUserDTOs = departmentUserService.list(departmentId);
         if (departmentUserDTOs.isEmpty()) {
             return new ArrayList<>();
@@ -66,6 +88,57 @@ public class RoleDepartmentUserServiceImpl extends DefaultBaseService implements
         return departmentUserDTOs;
     }
 
+    private List<DepartmentUserDTO> listUserByExcludeDepartment(String roleId) {
+        List<String> roleUserIds = roleUserService.listUserId(roleId);
+        if (roleUserIds.isEmpty()) {
+            return new ArrayList<>();
+        }
+        List<DepartmentUserDTO> hasDepartmentUsers = departmentUserService.list(roleUserIds);
+        List<String> departmentUserIds = ArrayListUtil.listBeanStringIdValue(hasDepartmentUsers, "userId", DepartmentUserDTO.class);
+        List<UserDTO> userDTOs = userService.listByExcludeIds(departmentUserIds, roleUserIds, null);
+        return departmentUserService.listExcludeDepartmentUser(userDTOs);
+    }
+
+    /**
+     * 没有组织机构的用户分页列表
+     *
+     * @param roleId 角色ID
+     * @param page
+     * @return
+     */
+    private SuccessResultList<List<DepartmentUserDTO>> listPageUserByExcludeDepartment(String roleId, ListPage page) {
+        List<String> roleUserIds = roleUserService.listUserId(roleId);
+        if (roleUserIds.isEmpty()) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
+        // 获取所有部门的用户列表
+        List<DepartmentUserDTO> hasDepartmentUsers = departmentUserService.list(getHashMap(0));
+        List<String> hasDepartmentUserIds = ArrayListUtil.listBeanStringIdValue(hasDepartmentUsers, "userId", DepartmentUserDTO.class);
+        SuccessResultList<List<UserDTO>> successResultList = userService.listPageByExcludeIdsAndIncludeIds(hasDepartmentUserIds, roleUserIds, page);
+        return departmentUserService.listPageExcludeDepartmentUser(successResultList);
+    }
+
+    /**
+     * 组织机构的用户分页列表
+     *
+     * @param departmentId 组织机构ID
+     * @param page
+     * @return
+     */
+    private SuccessResultList<List<DepartmentUserDTO>> listPageUser(String departmentId, String roleId, ListPage page) {
+        List<String> roleUserIds = roleUserService.listUserId(roleId);
+        if (roleUserIds.isEmpty()) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
+        List<DepartmentUserDTO> hasDepartmentUsers = departmentUserService.listByDepartmentIdAndUserIds(departmentId, roleUserIds);
+        List<String> userIds = new ArrayList<>();
+        for (DepartmentUserDTO hasDepartmentUserId : hasDepartmentUsers) {
+            userIds.add(hasDepartmentUserId.getUserId());
+        }
+        SuccessResultList<List<UserDTO>> successResultList = userService.listPageByIds(userIds, page);
+        return departmentUserService.listPageDepartmentUser(successResultList, hasDepartmentUsers);
+    }
+
     /**
      * 清除没有角色的用户
      *
diff --git a/service-role/src/main/resources/templates/role/list.html b/service-role/src/main/resources/templates/role/list.html
index cec3b348..73507f16 100644
--- a/service-role/src/main/resources/templates/role/list.html
+++ b/service-role/src/main/resources/templates/role/list.html
@@ -79,6 +79,7 @@
                         return '<button type="button" class="layui-btn layui-btn-xs" lay-event="userEvent"><i class="fa fa-users"></i> 查看</button>';
                     }
                 },
+                {field:'roleId', width:180, title: '角色ID', align:'center',},
                 {field:'roleName', width:170, title: '角色名称', align:'center',},
                 {field:'roleSummary', width:170, title: '角色说明', align:'center',},
                 {field:'roleCode', width:170, title: '角色编码', align:'center',},
diff --git a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java
index 967ffe35..7ebc4d1e 100644
--- a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java
+++ b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java
@@ -409,12 +409,32 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService
         return listPage(page);
     }
 
+    @Override
+    public SuccessResultList<List<UserDTO>> listPageByExcludeIdsAndIncludeIds(List<String> excludeUserIds, List<String> includeUserIds, ListPage page) {
+        page.getParams().put("excludeUserIds", excludeUserIds);
+        page.getParams().put("userIds", includeUserIds);
+        return listPage(page);
+    }
+
     @Override
     public List<UserDTO> listByExcludeIds(List<String> excludeUserIds, Map<String, Object> params) {
+        if(params == null) {
+            params = getHashMap(2);
+        }
         params.put("excludeUserIds", excludeUserIds);
         return list(params);
     }
 
+    @Override
+    public List<UserDTO> listByExcludeIds(List<String> excludeUserIds, List<String> includeUserIds, Map<String, Object> params) {
+        if(params == null) {
+            params = getHashMap(2);
+        }
+        params.put("excludeUserIds", excludeUserIds);
+        params.put("userIds", includeUserIds);
+        return list(params);
+    }
+
     @Override
     public Integer count(Map<String, Object> params) {
         Integer count = userDao.count(params);