Browse Source

人员添加字段HR信息

v1.0
15989082884@163.com 2 years ago
parent
commit
40e832044a
  1. 12
      src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
  2. 1
      src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
  3. 1
      src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java
  4. 2
      src/main/resources/mapper/sys/SysUserMapper.xml

12
src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@ -355,12 +355,12 @@ public class SysUserController {
// if(param.getLoginEnable()!=null){ // if(param.getLoginEnable()!=null){
// param.setServingState(param.getLoginEnable()==1?1:0); // param.setServingState(param.getLoginEnable()==1?1:0);
// } // }
if(param.getSyUserId()==null){ // if(param.getSyUserId()==null){
param.setSyUserId(null); // param.setSyUserId("");
} // }
if(param.getSyAccount()==null){ // if(param.getSyAccount()==null){
param.setSyAccount(null); // param.setSyAccount("");
} // }
param.setSuperFlag(null); param.setSuperFlag(null);
param.setPassword(null); param.setPassword(null);
param.setUpdateTime(LocalDateTime.now()); param.setUpdateTime(LocalDateTime.now());

1
src/main/java/com/qs/serve/modules/sys/entity/SysUser.java

@ -107,6 +107,7 @@ public class SysUser implements Serializable {
/** 致远用户id */ /** 致远用户id */
private String syUserId; private String syUserId;
private String hrSystemInfo;
/** 创建时间 */ /** 创建时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

1
src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java

@ -73,4 +73,5 @@ public class SysUserBo {
/** app推送token */ /** app推送token */
//private String appToken; //private String appToken;
private String hrSystemInfo;
} }

2
src/main/resources/mapper/sys/SysUserMapper.xml

@ -27,6 +27,7 @@
<result property="tenantId" column="tenant_id"/> <result property="tenantId" column="tenant_id"/>
<result property="syAccount" column="sy_account"/> <result property="syAccount" column="sy_account"/>
<result property="syUserId" column="sy_user_id"/> <result property="syUserId" column="sy_user_id"/>
<result property="hrSystemInfo" column="hr_system_info"/>
</resultMap> </resultMap>
<sql id="sysUserSql"> <sql id="sysUserSql">
@ -87,6 +88,7 @@
<if test="query.updateBy != null and query.updateBy != ''"> and sys_user.update_by = #{query.updateBy}</if> <if test="query.updateBy != null and query.updateBy != ''"> and sys_user.update_by = #{query.updateBy}</if>
<if test="query.delFlag != null"> and sys_user.del_flag = #{query.delFlag}</if> <if test="query.delFlag != null"> and sys_user.del_flag = #{query.delFlag}</if>
<if test="query.tenantId != null and query.tenantId != ''"> and sys_user.tenant_id = #{query.tenantId}</if> <if test="query.tenantId != null and query.tenantId != ''"> and sys_user.tenant_id = #{query.tenantId}</if>
<if test="query.hrSystemInfo != null and query.hrSystemInfo != ''"> and sys_user.hr_system_info = #{hrSystemInfo}</if>
<if test="query.multiDeptIds != null and query.multiDeptIds.size > 0 "> and sys_user.dept_id in <if test="query.multiDeptIds != null and query.multiDeptIds.size > 0 "> and sys_user.dept_id in
<foreach collection="query.multiDeptIds" item ="muDeptId" index="i" open="(" close=")" separator=","> <foreach collection="query.multiDeptIds" item ="muDeptId" index="i" open="(" close=")" separator=",">
#{muDeptId} #{muDeptId}

Loading…
Cancel
Save