feat(用户): 姓名/工号 查询
This commit is contained in:
+4
@@ -146,6 +146,10 @@ public class SysUserController {
|
|||||||
if (StrUtil.isNotEmpty(departId)){
|
if (StrUtil.isNotEmpty(departId)){
|
||||||
subDepIds = sysDepartService.getSubDepIdsByDepId(departId);
|
subDepIds = sysDepartService.getSubDepIdsByDepId(departId);
|
||||||
}
|
}
|
||||||
|
if (StringUtils.isNotBlank(user.getRealnameOrUsername())){
|
||||||
|
queryWrapper.and(aw -> aw.like("realname", user.getRealnameOrUsername())
|
||||||
|
.or().like("username", user.getRealnameOrUsername()));
|
||||||
|
}
|
||||||
|
|
||||||
IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
|
IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
|
|||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import com.jero.common.aspect.annotation.Dict;
|
import com.jero.common.aspect.annotation.Dict;
|
||||||
import io.swagger.annotations.Api;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
@@ -245,6 +244,13 @@ public class SysUser implements Serializable {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String departIds_dicText;
|
private String departIds_dicText;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 姓名/工号
|
||||||
|
*/
|
||||||
|
@ApiModelProperty(value = "姓名/工号")
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String realnameOrUsername;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接真实姓名和工号形成唯一的用户信息可用户查看
|
* 拼接真实姓名和工号形成唯一的用户信息可用户查看
|
||||||
* 不能用get开头,否则会造成初始化queryWrapper的bug
|
* 不能用get开头,否则会造成初始化queryWrapper的bug
|
||||||
|
|||||||
Reference in New Issue
Block a user