diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java index 33c6fb7..6c5ae4c 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java @@ -6,6 +6,7 @@ import com.bonus.common.core.annotation.Excel.Type; import com.bonus.common.core.annotation.Excels; import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.core.xss.Xss; +import lombok.Getter; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -41,6 +42,11 @@ public class SysUser extends BaseEntity { @Excel(name = "部门编号", type = Type.IMPORT) private Long deptId; + + @Getter + @Excel(name = "组织编号", type = Type.IMPORT) + private Long orgId; + /** * 公司ID */ @@ -154,7 +160,11 @@ public class SysUser extends BaseEntity { /**是否内置,0内置,1非内置*/ private String isBuiltIn = "1"; - private Long orgId; + + + public void setOrgId(Long orgId) { + this.orgId = orgId; + } public SysUser() { diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index 60f6796..e91c732 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -26,6 +26,7 @@ + @@ -54,6 +55,7 @@ select u.user_id, u.dept_id, u.dept_id as companyId, + u.org_id, u.user_name, u.nick_name, u.phonenumber, @@ -90,7 +92,7 @@ - select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.phonenumber, u.status, u.create_time,u.is_built_in + select distinct u.user_id, u.dept_id, u.org_id,u.user_name, u.nick_name, u.phonenumber, u.status, u.create_time,u.is_built_in from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id @@ -188,7 +190,7 @@ - select u.user_id, u.dept_id, u.nick_name, u.user_name, u.phonenumber,u.sex, u.status, + select u.user_id, u.dept_id, u.org_id, u.nick_name, u.user_name, u.phonenumber,u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.approval_status,u.is_permanent,u.is_built_in, d.dept_name, d.leader,r.role_id, r.role_name, @@ -311,6 +313,7 @@ approval_status, is_permanent, is_built_in, + org_id, create_time )values( #{userId}, @@ -327,6 +330,7 @@ #{approvalStatus}, #{isPermanent}, #{isBuiltIn}, + #{orgId}, sysdate() ) @@ -348,6 +352,7 @@ login_type = #{loginType}, is_permanent = #{isPermanent}, is_built_in = #{isBuiltIn}, + org_id = #{orgId}, update_time = sysdate() where user_id = #{userId}