diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index 9cf0bf6a..840197e4 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -355,12 +355,12 @@ public class SysUserController { // if(param.getLoginEnable()!=null){ // param.setServingState(param.getLoginEnable()==1?1:0); // } - if(param.getSyUserId()==null){ - param.setSyUserId(null); - } - if(param.getSyAccount()==null){ - param.setSyAccount(null); - } +// if(param.getSyUserId()==null){ +// param.setSyUserId(""); +// } +// if(param.getSyAccount()==null){ +// param.setSyAccount(""); +// } param.setSuperFlag(null); param.setPassword(null); param.setUpdateTime(LocalDateTime.now()); diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java index 7707c2b3..92f4a1d4 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java @@ -107,6 +107,7 @@ public class SysUser implements Serializable { /** 致远用户id */ private String syUserId; + private String hrSystemInfo; /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java b/src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java index d2f99627..eb87122c 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java @@ -73,4 +73,5 @@ public class SysUserBo { /** app推送token */ //private String appToken; + private String hrSystemInfo; } diff --git a/src/main/resources/mapper/sys/SysUserMapper.xml b/src/main/resources/mapper/sys/SysUserMapper.xml index f06e6ce8..ef134ea9 100644 --- a/src/main/resources/mapper/sys/SysUserMapper.xml +++ b/src/main/resources/mapper/sys/SysUserMapper.xml @@ -27,6 +27,7 @@ + @@ -87,6 +88,7 @@ and sys_user.update_by = #{query.updateBy} and sys_user.del_flag = #{query.delFlag} and sys_user.tenant_id = #{query.tenantId} + and sys_user.hr_system_info = #{hrSystemInfo} and sys_user.dept_id in #{muDeptId}