|
@@ -14,7 +14,7 @@ import com.ruoyi.common.xss.Xss;
|
|
|
|
|
|
/**
|
|
|
* 用户对象 sys_user
|
|
|
- *
|
|
|
+ *
|
|
|
* @author ruoyi
|
|
|
*/
|
|
|
public class SysUser extends BaseEntity
|
|
@@ -29,6 +29,9 @@ public class SysUser extends BaseEntity
|
|
|
@Excel(name = "部门编号", type = Type.IMPORT)
|
|
|
private Long deptId;
|
|
|
|
|
|
+ /** 租户ID */
|
|
|
+ private Long tenantId;
|
|
|
+
|
|
|
/** 用户账号 */
|
|
|
@Excel(name = "登录名称")
|
|
|
private String userName;
|
|
@@ -37,6 +40,9 @@ public class SysUser extends BaseEntity
|
|
|
@Excel(name = "用户名称")
|
|
|
private String nickName;
|
|
|
|
|
|
+ /**用户类型 (00系统用户 01 租户管理员)*/
|
|
|
+ private String userType;
|
|
|
+
|
|
|
/** 用户邮箱 */
|
|
|
@Excel(name = "用户邮箱")
|
|
|
private String email;
|
|
@@ -72,11 +78,14 @@ public class SysUser extends BaseEntity
|
|
|
|
|
|
/** 部门对象 */
|
|
|
@Excels({
|
|
|
- @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
|
|
|
- @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
|
|
|
+ @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
|
|
|
+ @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
|
|
|
})
|
|
|
private SysDept dept;
|
|
|
|
|
|
+
|
|
|
+ private SysTenant tenant;
|
|
|
+
|
|
|
/** 角色对象 */
|
|
|
private List<SysRole> roles;
|
|
|
|
|
@@ -89,6 +98,9 @@ public class SysUser extends BaseEntity
|
|
|
/** 角色ID */
|
|
|
private Long roleId;
|
|
|
|
|
|
+ /** 租户名称 */
|
|
|
+ private String tenantName;
|
|
|
+
|
|
|
public SysUser()
|
|
|
{
|
|
|
|
|
@@ -119,6 +131,10 @@ public class SysUser extends BaseEntity
|
|
|
return userId != null && 1L == userId;
|
|
|
}
|
|
|
|
|
|
+ public boolean isTenantAdmin() {
|
|
|
+ return "01".equals(this.userType) && this.tenantId != null;
|
|
|
+ }
|
|
|
+
|
|
|
public Long getDeptId()
|
|
|
{
|
|
|
return deptId;
|
|
@@ -129,6 +145,13 @@ public class SysUser extends BaseEntity
|
|
|
this.deptId = deptId;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ public Long getTenantId() { return tenantId; }
|
|
|
+
|
|
|
+ public void setTenantId(Long tenantId) {
|
|
|
+ this.tenantId = tenantId;
|
|
|
+ }
|
|
|
+
|
|
|
@Xss(message = "用户昵称不能包含脚本字符")
|
|
|
@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
|
|
|
public String getNickName()
|
|
@@ -154,6 +177,14 @@ public class SysUser extends BaseEntity
|
|
|
this.userName = userName;
|
|
|
}
|
|
|
|
|
|
+ public String getUserType() {
|
|
|
+ return userType;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setUserType(String userType) {
|
|
|
+ this.userType = userType;
|
|
|
+ }
|
|
|
+
|
|
|
@Email(message = "邮箱格式不正确")
|
|
|
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
|
|
|
public String getEmail()
|
|
@@ -257,6 +288,12 @@ public class SysUser extends BaseEntity
|
|
|
this.dept = dept;
|
|
|
}
|
|
|
|
|
|
+ public SysTenant getTenant() {
|
|
|
+ return tenant;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setTenant(SysTenant tenant) { this.tenant = tenant; }
|
|
|
+
|
|
|
public List<SysRole> getRoles()
|
|
|
{
|
|
|
return roles;
|
|
@@ -297,28 +334,39 @@ public class SysUser extends BaseEntity
|
|
|
this.roleId = roleId;
|
|
|
}
|
|
|
|
|
|
+ public String getTenantName() {
|
|
|
+ return tenantName;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setTenantName(String tenantName) {
|
|
|
+ this.tenantName = tenantName;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public String toString() {
|
|
|
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
|
|
- .append("userId", getUserId())
|
|
|
- .append("deptId", getDeptId())
|
|
|
- .append("userName", getUserName())
|
|
|
- .append("nickName", getNickName())
|
|
|
- .append("email", getEmail())
|
|
|
- .append("phonenumber", getPhonenumber())
|
|
|
- .append("sex", getSex())
|
|
|
- .append("avatar", getAvatar())
|
|
|
- .append("password", getPassword())
|
|
|
- .append("status", getStatus())
|
|
|
- .append("delFlag", getDelFlag())
|
|
|
- .append("loginIp", getLoginIp())
|
|
|
- .append("loginDate", getLoginDate())
|
|
|
- .append("createBy", getCreateBy())
|
|
|
- .append("createTime", getCreateTime())
|
|
|
- .append("updateBy", getUpdateBy())
|
|
|
- .append("updateTime", getUpdateTime())
|
|
|
- .append("remark", getRemark())
|
|
|
- .append("dept", getDept())
|
|
|
- .toString();
|
|
|
+ .append("userId", getUserId())
|
|
|
+ .append("deptId", getDeptId())
|
|
|
+ .append("tenantId", getTenantId())
|
|
|
+ .append("userName", getUserName())
|
|
|
+ .append("nickName", getNickName())
|
|
|
+ .append("email", getEmail())
|
|
|
+ .append("phonenumber", getPhonenumber())
|
|
|
+ .append("sex", getSex())
|
|
|
+ .append("avatar", getAvatar())
|
|
|
+ .append("password", getPassword())
|
|
|
+ .append("status", getStatus())
|
|
|
+ .append("delFlag", getDelFlag())
|
|
|
+ .append("loginIp", getLoginIp())
|
|
|
+ .append("loginDate", getLoginDate())
|
|
|
+ .append("createBy", getCreateBy())
|
|
|
+ .append("createTime", getCreateTime())
|
|
|
+ .append("updateBy", getUpdateBy())
|
|
|
+ .append("updateTime", getUpdateTime())
|
|
|
+ .append("remark", getRemark())
|
|
|
+ .append("dept", getDept())
|
|
|
+ .append("tenant", getTenant())
|
|
|
+ .append("tenantName",getTenantName())
|
|
|
+ .toString();
|
|
|
}
|
|
|
}
|