From 3db40b8c8c6ec8d46f20ceb1d3a9b812633854ae Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 9 Nov 2023 22:43:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.0.3=E3=80=91=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8F=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=94=A8=E6=88=B7=E5=B7=A5=E5=8F=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/sys/modular/user/entity/SysUser.java | 7 +++++++ .../sys/modular/user/pojo/request/SysUserRequest.java | 8 ++++++-- .../sys/modular/user/service/impl/SysUserServiceImpl.java | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java index f4daf284b..49cdca264 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java @@ -158,6 +158,13 @@ public class SysUser extends BaseExpandFieldEntity { @ChineseDescription("用户的排序") private BigDecimal userSort; + /** + * 用户工号 + */ + @TableField("employee_number") + @ChineseDescription("用户工号") + private String employeeNumber; + /** * 对接外部主数据的用户id */ diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserRequest.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserRequest.java index b28609021..c71b7e8ed 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserRequest.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserRequest.java @@ -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.sys.modular.user.entity.SysUserOrg; import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.EqualsAndHashCode; @@ -128,10 +127,15 @@ public class SysUserRequest extends BaseRequest { /** * 用户的排序 */ - @TableField("user_sort") @ChineseDescription("用户的排序") private BigDecimal userSort = new BigDecimal(1000); + /** + * 用户工号 + */ + @ChineseDescription("用户工号") + private String employeeNumber; + /** * 对接外部主数据的用户id */ diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java index c6b6d4e90..8df3cf9b1 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -225,7 +225,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // 只查询需要的字段 wrapper.select(SysUser::getUserId, SysUser::getRealName, SysUser::getAccount, SysUser::getSex, SysUser::getStatusFlag, - BaseEntity::getCreateTime); + BaseEntity::getCreateTime, SysUser::getEmployeeNumber); // 分页查询 Page sysUserPage = this.page(PageFactory.defaultPage(), wrapper); @@ -691,6 +691,7 @@ public class SysUserServiceImpl extends ServiceImpl impl wrap.or().like(SysUser::getAccount, searchText); wrap.or().like(SysUser::getPhone, searchText); wrap.or().like(SysUser::getTel, searchText); + wrap.or().like(SysUser::getEmployeeNumber, searchText); }); }