diff --git a/src/main/java/com/ydool/system/controller/UserController.java b/src/main/java/com/ydool/system/controller/UserController.java index 31a54fc..4567c91 100644 --- a/src/main/java/com/ydool/system/controller/UserController.java +++ b/src/main/java/com/ydool/system/controller/UserController.java @@ -53,6 +53,7 @@ public class UserController extends BaseController { @ApiImplicitParam(name = "status", value = "启用状态", dataType = "Boolean"), @ApiImplicitParam(name = "role", value = "角色"), @ApiImplicitParam(name = "dept", value = "部门"), + @ApiImplicitParam(name = "dept", value = "岗位"), }) @ApiOperationSupport( responses = @DynamicResponseParameters(properties = { @@ -65,9 +66,10 @@ public class UserController extends BaseController { String orderBy, Boolean status, String role, - String dept + String dept, + String job ) { - return userService.userList(getPage(), value, column, orderBy, status, role, dept); + return userService.userList(getPage(), value, column, orderBy, status, role, dept, job); } /** diff --git a/src/main/java/com/ydool/system/service/IUserService.java b/src/main/java/com/ydool/system/service/IUserService.java index 4fa037d..1d29972 100644 --- a/src/main/java/com/ydool/system/service/IUserService.java +++ b/src/main/java/com/ydool/system/service/IUserService.java @@ -64,7 +64,6 @@ public interface IUserService { /** * 用户列表 - * * @param page * @param value * @param column @@ -72,10 +71,11 @@ public interface IUserService { * @param status * @param role * @param dept + * @param job * @return */ AjaxResult userList(Page page, String value, String column, String orderBy, Boolean status, String role, - String dept); + String dept,String job); /** * 重置密码 diff --git a/src/main/java/com/ydool/system/service/impl/UserServiceImpl.java b/src/main/java/com/ydool/system/service/impl/UserServiceImpl.java index 9e61553..00bebbc 100644 --- a/src/main/java/com/ydool/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/ydool/system/service/impl/UserServiceImpl.java @@ -145,11 +145,12 @@ public class UserServiceImpl extends BaseService implements IU * @param status * @param role * @param dept + * @param job * @return */ @Override public AjaxResult userList(Page page, String value, String column, String orderBy, Boolean status, String role, - String dept) { + String dept, String job) { QueryWrapper qw = new QueryWrapper(); if (StrUtil.isNotBlank(value)) { qw.like("AES_DECRYPT(from_base64 (phone),'" + CodecUtils.KEY + "')", value).lambda() @@ -160,7 +161,8 @@ public class UserServiceImpl extends BaseService implements IU qw.lambda().eq(ObjectUtil.isNotNull(status), User::getStatus, status) .eq(StrUtil.isNotBlank(dept), User::getDept, dept) - .like(StrUtil.isNotBlank(role), User::getRoles, role); + .like(StrUtil.isNotBlank(role), User::getRoles, role) + .eq(StrUtil.isNotBlank(job), User::getJob, job); if ("desc".equals(orderBy) && StrUtil.isNotBlank(column)) { qw.orderByDesc(StrUtil.toUnderlineCase(column)); @@ -258,7 +260,7 @@ public class UserServiceImpl extends BaseService implements IU @Override public List menuTreesByUser(String id) { List roles = roleListByUser(id); - if(CollUtil.isNotEmpty(roles)) { + if (CollUtil.isNotEmpty(roles)) { String menus = roles.stream().map(Role::getMenus).collect(Collectors.joining(",")); List> menuMap = menuService.listMaps(new QueryWrapper().lambda() @@ -321,7 +323,7 @@ public class UserServiceImpl extends BaseService implements IU @Override public List menusByUser(String id) { List roles = roleListByUser(id); - if(CollUtil.isNotEmpty(roles)){ + if (CollUtil.isNotEmpty(roles)) { String menus = roles.stream().map(Role::getMenus).collect(Collectors.joining(",")); List menuList = menuService.list(new QueryWrapper().lambda() .in(Menu::getId, Arrays.asList(menus.split( @@ -334,7 +336,6 @@ public class UserServiceImpl extends BaseService implements IU } - return null; }