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 6dde09d2..e389a675 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 @@ -78,7 +78,16 @@ public interface IUserBaseService { SuccessResultList> listPageByIds(List userIds, ListPage page); /** - * 用户ID分页列表 + * 用户列表 + * + * @param userIds 用户ID列表 + * @param params + * @return + */ + List listByIds(List userIds, Map params); + + /** + * 不包含的用户分页列表 * * @param excludeUserIds 不包含的用户ID * @param page @@ -86,6 +95,16 @@ public interface IUserBaseService { */ SuccessResultList> listPageByExcludeIds(List excludeUserIds, ListPage page); + /** + * 不包含的用户分页列表 + * + * @param userIds 不包含的用户ID列表 + * @param params + * @return + */ + List listByExcludeIds(List excludeUserIds, Map params); + + /** * 用户统计 * @@ -140,4 +159,5 @@ public interface IUserBaseService { * @return */ List listByKeywords(String keywords); + } diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java index 4864f5d8..695277e8 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java @@ -46,4 +46,7 @@ public interface IDepartmentUserRemoteService { @RemoteGetMethod("/listpage/{departmentId}") SuccessResultList> listPage(@RemoteServerParams String userCenter, @PathVariable("departmentId") String departmentId, @RemotePathParams("access_token") String accessToken, @RemoteQueryParams("page") int page, @RemoteQueryParams("rows") int rows, @RemoteQueryParamsMap Map params); + @RemoteGetMethod("/list/{departmentId}") + List list(@RemoteServerParams String userCenter, @PathVariable("departmentId") String departmentId, @RemotePathParams("access_token") String accessToken, @RemoteQueryParamsMap Map params); + } diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java index 8c31e533..6424612f 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java @@ -1,17 +1,21 @@ package ink.wgink.login.oauth2.client.service.department.impl; import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.login.oauth2.client.remote.department.IDepartmentUserRemoteService; import ink.wgink.login.oauth2.client.service.department.IDepartmentUserService; import ink.wgink.module.oauth2.manager.OAuth2ClientTokenManager; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.department.DepartmentUserDTO; +import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.vos.IdsVO; import ink.wgink.properties.ApiPathProperties; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -78,4 +82,10 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe public SuccessResultList> listPage(String departmentId, ListPage page) { return departmentUserRemoteService.listPage(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getPage(), page.getRows(), page.getParams()); } + + @Override + public List list(String departmentId, Map params) { + return departmentUserRemoteService.list(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params); + } + } 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 7a3711df..47bd6523 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 @@ -75,12 +75,24 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService return userRemoteService.listPage(apiPathProperties.getUserCenter(), page.getPage(), page.getRows(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getParams()); } + @Override + public List listByIds(List userIds, Map params) { + params.put("userIds", userIds); + return userRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params); + } + @Override public SuccessResultList> listPageByExcludeIds(List excludeUserIds, ListPage page) { page.getParams().put("excludeUserIds", excludeUserIds); return userRemoteService.listPage(apiPathProperties.getUserCenter(), page.getPage(), page.getRows(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), page.getParams()); } + @Override + public List listByExcludeIds(List excludeUserIds, Map params) { + params.put("excludeUserIds", excludeUserIds); + return userRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params); + } + @Override public int countDateRange(String startDate, String endDate) { SuccessResultData successResultData = userRemoteService.countDateRange(apiPathProperties.getUserCenter(), startDate, endDate, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken()); diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentUserResourceController.java b/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentUserResourceController.java index e63dd793..0252c977 100644 --- a/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentUserResourceController.java +++ b/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentUserResourceController.java @@ -95,7 +95,7 @@ public class DepartmentUserResourceController extends DefaultBaseController { return departmentUserService.listUserId(idsVO.getIds(), idsVO.getIds2()); } - @ApiOperation(value = "组织部门用户列表", notes = "组织部门用户列表接口") + @ApiOperation(value = "组织部门用户分页列表", notes = "组织部门用户分页列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path"), @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), @@ -108,4 +108,16 @@ public class DepartmentUserResourceController extends DefaultBaseController { return departmentUserService.listPage(departmentId, page); } + @ApiOperation(value = "组织部门用户列表", notes = "组织部门用户列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list/{departmentId}") + public List listPage(@PathVariable("departmentId") String departmentId) { + Map params = requestParams(); + return departmentUserService.list(departmentId, params); + } + } 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 36215fa8..3efbb04f 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 @@ -249,7 +249,7 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe userIds.add(hasDepartmentUserId.getUserId()); } List userDTOs = userBaseService.listByExcludeIds(userIds, params); - return listPageExcludeDepartmentUser(successResultList); + return listExcludeDepartmentUser(userDTOs); } /** @@ -272,6 +272,13 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe return listPageDepartmentUser(successResultList, hasDepartmentUsers); } + /** + * 用户列表 + * + * @param departmentId 部门ID + * @param params + * @return + */ private List listUser(String departmentId, Map params) { List hasDepartmentUsers = list(getHashMap(0)); if (hasDepartmentUsers.isEmpty()) { @@ -294,13 +301,7 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe private SuccessResultList> listPageExcludeDepartmentUser(SuccessResultList> successResultList) { // 查询用户排序 List userDTOs = successResultList.getRows(); - List departmentUserDTOs = new ArrayList<>(); - for (UserDTO userDTO : userDTOs) { - DepartmentUserDTO departmentUserDTO = new DepartmentUserDTO(userDTO); - departmentUserDTO.setDepartmentId(""); - departmentUserDTO.setUserSort("ZZZ-000"); - departmentUserDTOs.add(departmentUserDTO); - } + List departmentUserDTOs = listExcludeDepartmentUser(userDTOs); return new SuccessResultList<>(departmentUserDTOs, successResultList.getPage(), successResultList.getTotal()); } @@ -332,6 +333,19 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe private SuccessResultList> listPageDepartmentUser(SuccessResultList> successResultList, List hasDepartmentUsers) { // 查询用户排序 List userDTOs = successResultList.getRows(); + List departmentUserDTOs = listDepartmentUser(userDTOs, hasDepartmentUsers); + return new SuccessResultList<>(departmentUserDTOs, successResultList.getPage(), successResultList.getTotal()); + } + + /** + * 部门用户列表 + * + * @param userDTOs + * @param hasDepartmentUsers + * @return + */ + private List listDepartmentUser(List userDTOs, List hasDepartmentUsers) { + // 查询用户排序 List departmentUserDTOs = new ArrayList<>(); for (DepartmentUserDTO hasDepartmentUserDTO : hasDepartmentUsers) { for (UserDTO userDTO : userDTOs) { @@ -343,10 +357,7 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe } } } - return new SuccessResultList<>(departmentUserDTOs, successResultList.getPage(), successResultList.getTotal()); - } - - private List listDepartmentUser(List userDTOs, List hasDepartmentUsers) { + return departmentUserDTOs; } } 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 6206d6b7..d97a808b 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 @@ -161,7 +161,6 @@ } } } - console.log(data) var userDom = ''; for(var i = 0, item; item = data[i++];) { var avatarDom; @@ -172,7 +171,6 @@ } userDom += ''+ avatarDom + item.userName +' ['+ item.userUsername +']'; } - console.log(userDom) $('#userWrapper').append(userDom); } // 初始化懒加载 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 a9824e5c..7c479667 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 @@ -376,12 +376,24 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService return listPage(page); } + @Override + public List listByIds(List userIds, Map params) { + params.put("userIds", userIds); + return list(params); + } + @Override public SuccessResultList> listPageByExcludeIds(List excludeUserIds, ListPage page) { page.getParams().put("excludeUserIds", excludeUserIds); return listPage(page); } + @Override + public List listByExcludeIds(List excludeUserIds, Map params) { + params.put("excludeUserIds", excludeUserIds); + return list(params); + } + @Override public Integer count(Map params) { Integer count = userDao.count(params);