mirror of https://gitee.com/stylefeng/roses
【8.0.3】用户实体增加工号字段,查询列表返回用户工号信息
parent
b9d7dbdd83
commit
3db40b8c8c
|
@ -158,6 +158,13 @@ public class SysUser extends BaseExpandFieldEntity {
|
||||||
@ChineseDescription("用户的排序")
|
@ChineseDescription("用户的排序")
|
||||||
private BigDecimal userSort;
|
private BigDecimal userSort;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户工号
|
||||||
|
*/
|
||||||
|
@TableField("employee_number")
|
||||||
|
@ChineseDescription("用户工号")
|
||||||
|
private String employeeNumber;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 对接外部主数据的用户id
|
* 对接外部主数据的用户id
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -4,7 +4,6 @@ import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
|
||||||
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
|
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
|
||||||
import cn.stylefeng.roses.kernel.sys.modular.user.entity.SysUserOrg;
|
import cn.stylefeng.roses.kernel.sys.modular.user.entity.SysUserOrg;
|
||||||
import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
|
import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
@ -128,10 +127,15 @@ public class SysUserRequest extends BaseRequest {
|
||||||
/**
|
/**
|
||||||
* 用户的排序
|
* 用户的排序
|
||||||
*/
|
*/
|
||||||
@TableField("user_sort")
|
|
||||||
@ChineseDescription("用户的排序")
|
@ChineseDescription("用户的排序")
|
||||||
private BigDecimal userSort = new BigDecimal(1000);
|
private BigDecimal userSort = new BigDecimal(1000);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户工号
|
||||||
|
*/
|
||||||
|
@ChineseDescription("用户工号")
|
||||||
|
private String employeeNumber;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 对接外部主数据的用户id
|
* 对接外部主数据的用户id
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -225,7 +225,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
||||||
|
|
||||||
// 只查询需要的字段
|
// 只查询需要的字段
|
||||||
wrapper.select(SysUser::getUserId, SysUser::getRealName, SysUser::getAccount, SysUser::getSex, SysUser::getStatusFlag,
|
wrapper.select(SysUser::getUserId, SysUser::getRealName, SysUser::getAccount, SysUser::getSex, SysUser::getStatusFlag,
|
||||||
BaseEntity::getCreateTime);
|
BaseEntity::getCreateTime, SysUser::getEmployeeNumber);
|
||||||
|
|
||||||
// 分页查询
|
// 分页查询
|
||||||
Page<SysUser> sysUserPage = this.page(PageFactory.defaultPage(), wrapper);
|
Page<SysUser> sysUserPage = this.page(PageFactory.defaultPage(), wrapper);
|
||||||
|
@ -691,6 +691,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
||||||
wrap.or().like(SysUser::getAccount, searchText);
|
wrap.or().like(SysUser::getAccount, searchText);
|
||||||
wrap.or().like(SysUser::getPhone, searchText);
|
wrap.or().like(SysUser::getPhone, searchText);
|
||||||
wrap.or().like(SysUser::getTel, searchText);
|
wrap.or().like(SysUser::getTel, searchText);
|
||||||
|
wrap.or().like(SysUser::getEmployeeNumber, searchText);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue