xiangshan
/
lcoa-java
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

岗位

This commit is contained in:
lijiaqi 2023-02-09 10:53:09 +08:00
parent 42a9a604cd
commit 69c319eaf1
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ydool/system/controller/UserController.java
View File

@ -53,6 +53,7 @@ public class UserController extends BaseController {
@ApiImplicitParam(name = "status", value = "启用状态", dataType = "Boolean"), @ApiImplicitParam(name = "status", value = "启用状态", dataType = "Boolean"),
@ApiImplicitParam(name = "role", value = "角色"), @ApiImplicitParam(name = "role", value = "角色"),
@ApiImplicitParam(name = "dept", value = "部门"), @ApiImplicitParam(name = "dept", value = "部门"),
@ApiImplicitParam(name = "dept", value = "岗位"),
}) })
@ApiOperationSupport( @ApiOperationSupport(
responses = @DynamicResponseParameters(properties = { responses = @DynamicResponseParameters(properties = {
@ -65,9 +66,10 @@ public class UserController extends BaseController {
String orderBy, String orderBy,
Boolean status, Boolean status,
String role, 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);
} }
/** /**

4
src/main/java/com/ydool/system/service/IUserService.java
View File

@ -64,7 +64,6 @@ public interface IUserService {
/** /**
* 用户列表 * 用户列表
*
* @param page * @param page
* @param value * @param value
* @param column * @param column
@ -72,10 +71,11 @@ public interface IUserService {
* @param status * @param status
* @param role * @param role
* @param dept * @param dept
* @param job
* @return * @return
*/ */
AjaxResult userList(Page page, String value, String column, String orderBy, Boolean status, String role, AjaxResult userList(Page page, String value, String column, String orderBy, Boolean status, String role,
String dept); String dept,String job);
/** /**
* 重置密码 * 重置密码

11
src/main/java/com/ydool/system/service/impl/UserServiceImpl.java
View File

@ -145,11 +145,12 @@ public class UserServiceImpl extends BaseService<UserMapper, User> implements IU
* @param status * @param status
* @param role * @param role
* @param dept * @param dept
* @param job
* @return * @return
*/ */
@Override @Override
public AjaxResult userList(Page page, String value, String column, String orderBy, Boolean status, String role, public AjaxResult userList(Page page, String value, String column, String orderBy, Boolean status, String role,
String dept) { String dept, String job) {
QueryWrapper<User> qw = new QueryWrapper<User>(); QueryWrapper<User> qw = new QueryWrapper<User>();
if (StrUtil.isNotBlank(value)) { if (StrUtil.isNotBlank(value)) {
qw.like("AES_DECRYPT(from_base64 (phone),'" + CodecUtils.KEY + "')", value).lambda() qw.like("AES_DECRYPT(from_base64 (phone),'" + CodecUtils.KEY + "')", value).lambda()
@ -160,7 +161,8 @@ public class UserServiceImpl extends BaseService<UserMapper, User> implements IU
qw.lambda().eq(ObjectUtil.isNotNull(status), User::getStatus, status) qw.lambda().eq(ObjectUtil.isNotNull(status), User::getStatus, status)
.eq(StrUtil.isNotBlank(dept), User::getDept, dept) .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)) { if ("desc".equals(orderBy) && StrUtil.isNotBlank(column)) {
qw.orderByDesc(StrUtil.toUnderlineCase(column)); qw.orderByDesc(StrUtil.toUnderlineCase(column));
@ -258,7 +260,7 @@ public class UserServiceImpl extends BaseService<UserMapper, User> implements IU
@Override @Override
public List<Menu> menuTreesByUser(String id) { public List<Menu> menuTreesByUser(String id) {
List<Role> roles = roleListByUser(id); List<Role> roles = roleListByUser(id);
if(CollUtil.isNotEmpty(roles)) { if (CollUtil.isNotEmpty(roles)) {
String menus = roles.stream().map(Role::getMenus).collect(Collectors.joining(",")); String menus = roles.stream().map(Role::getMenus).collect(Collectors.joining(","));
List<Map<String, Object>> menuMap = menuService.listMaps(new QueryWrapper<Menu>().lambda() List<Map<String, Object>> menuMap = menuService.listMaps(new QueryWrapper<Menu>().lambda()
@ -321,7 +323,7 @@ public class UserServiceImpl extends BaseService<UserMapper, User> implements IU
@Override @Override
public List<Menu> menusByUser(String id) { public List<Menu> menusByUser(String id) {
List<Role> roles = roleListByUser(id); List<Role> roles = roleListByUser(id);
if(CollUtil.isNotEmpty(roles)){ if (CollUtil.isNotEmpty(roles)) {
String menus = roles.stream().map(Role::getMenus).collect(Collectors.joining(",")); String menus = roles.stream().map(Role::getMenus).collect(Collectors.joining(","));
List<Menu> menuList = menuService.list(new QueryWrapper<Menu>().lambda() List<Menu> menuList = menuService.list(new QueryWrapper<Menu>().lambda()
.in(Menu::getId, Arrays.asList(menus.split( .in(Menu::getId, Arrays.asList(menus.split(
@ -334,7 +336,6 @@ public class UserServiceImpl extends BaseService<UserMapper, User> implements IU
} }
return null; return null;
} }