diff --git a/ems-common/src/main/java/com/xzzn/common/core/domain/entity/SysUser.java b/ems-common/src/main/java/com/xzzn/common/core/domain/entity/SysUser.java index ad21f2a..02e87a6 100644 --- a/ems-common/src/main/java/com/xzzn/common/core/domain/entity/SysUser.java +++ b/ems-common/src/main/java/com/xzzn/common/core/domain/entity/SysUser.java @@ -92,6 +92,8 @@ public class SysUser extends BaseEntity /** 角色ID */ private Long roleId; + private String belongSite; + public SysUser() { @@ -310,6 +312,14 @@ public class SysUser extends BaseEntity this.roleId = roleId; } + public String getBelongSite() { + return belongSite; + } + + public void setBelongSite(String belongSite) { + this.belongSite = belongSite; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -332,7 +342,7 @@ public class SysUser extends BaseEntity .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) - .append("dept", getDept()) + .append("belongSite", getBelongSite()) .toString(); } } diff --git a/ems-system/src/main/resources/mapper/system/SysUserMapper.xml b/ems-system/src/main/resources/mapper/system/SysUserMapper.xml index 8323545..c8751d2 100644 --- a/ems-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ems-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -24,7 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + @@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, - d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, + d.dept_id, d.parent_id, d.ancestors, d.dept_name, u.belong_site , d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -158,6 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pwd_update_date, create_by, remark, + belong_site, create_time )values( #{userId}, @@ -173,6 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{pwdUpdateDate}, #{createBy}, #{remark}, + #{belongSite}, sysdate() ) @@ -192,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" login_date = #{loginDate}, update_by = #{updateBy}, remark = #{remark}, + belong_site = #{belongSite}, update_time = sysdate() where user_id = #{userId}