Mobai
/
ruoyi-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

品类组件响应，属性组bug修改

day-06
Saisai Liu 2024-03-22 07:59:41 +08:00
parent 007aa4c276
commit cb700cf596
5 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java
View File

@ -204,7 +204,7 @@ public class SysDept extends BaseEntity {
.append("email", getEmail())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("createBy", SecurityUtils.getUsername())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())

2
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java
View File

@ -175,7 +175,7 @@ public class SysDictData extends BaseEntity {
.append("listClass", getListClass())
.append("isDefault", getIsDefault())
.append("status", getStatus())
.append("createBy", SecurityUtils.getUsername())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())

2
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java
View File

@ -96,7 +96,7 @@ public class SysDictType extends BaseEntity {
.append("dictName", getDictName())
.append("dictType", getDictType())
.append("status", getStatus())
.append("createBy", SecurityUtils.getUsername())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())

62
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java
View File

@ -101,129 +101,129 @@ public class SysRole extends BaseEntity {
private Set<String> permissions;
public SysRole (Long roleId) {
public SysRole(Long roleId) {
this.roleId = roleId;
}
public static boolean isAdmin (Long roleId) {
public static boolean isAdmin(Long roleId) {
return roleId != null && 1L == roleId;
}
public Long getRoleId () {
public Long getRoleId() {
return roleId;
}
public void setRoleId (Long roleId) {
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
public boolean isAdmin () {
public boolean isAdmin() {
return isAdmin(this.roleId);
}
@NotBlank(message = "角色名称不能为空")
@Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
public String getRoleName () {
public String getRoleName() {
return roleName;
}
public void setRoleName (String roleName) {
public void setRoleName(String roleName) {
this.roleName = roleName;
}
@NotBlank(message = "权限字符不能为空")
@Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
public String getRoleKey () {
public String getRoleKey() {
return roleKey;
}
public void setRoleKey (String roleKey) {
public void setRoleKey(String roleKey) {
this.roleKey = roleKey;
}
@NotNull(message = "显示顺序不能为空")
public Integer getRoleSort () {
public Integer getRoleSort() {
return roleSort;
}
public void setRoleSort (Integer roleSort) {
public void setRoleSort(Integer roleSort) {
this.roleSort = roleSort;
}
public String getDataScope () {
public String getDataScope() {
return dataScope;
}
public void setDataScope (String dataScope) {
public void setDataScope(String dataScope) {
this.dataScope = dataScope;
}
public boolean isMenuCheckStrictly () {
public boolean isMenuCheckStrictly() {
return menuCheckStrictly;
}
public void setMenuCheckStrictly (boolean menuCheckStrictly) {
public void setMenuCheckStrictly(boolean menuCheckStrictly) {
this.menuCheckStrictly = menuCheckStrictly;
}
public boolean isDeptCheckStrictly () {
public boolean isDeptCheckStrictly() {
return deptCheckStrictly;
}
public void setDeptCheckStrictly (boolean deptCheckStrictly) {
public void setDeptCheckStrictly(boolean deptCheckStrictly) {
this.deptCheckStrictly = deptCheckStrictly;
}
public String getStatus () {
public String getStatus() {
return status;
}
public void setStatus (String status) {
public void setStatus(String status) {
this.status = status;
}
public String getDelFlag () {
public String getDelFlag() {
return delFlag;
}
public void setDelFlag (String delFlag) {
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public boolean isFlag () {
public boolean isFlag() {
return flag;
}
public void setFlag (boolean flag) {
public void setFlag(boolean flag) {
this.flag = flag;
}
public Long[] getMenuIds () {
public Long[] getMenuIds() {
return menuIds;
}
public void setMenuIds (Long[] menuIds) {
public void setMenuIds(Long[] menuIds) {
this.menuIds = menuIds;
}
public Long[] getDeptIds () {
public Long[] getDeptIds() {
return deptIds;
}
public void setDeptIds (Long[] deptIds) {
public void setDeptIds(Long[] deptIds) {
this.deptIds = deptIds;
}
public Set<String> getPermissions () {
public Set<String> getPermissions() {
return permissions;
}
public void setPermissions (Set<String> permissions) {
public void setPermissions(Set<String> permissions) {
this.permissions = permissions;
}
@Override
public String toString () {
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("roleId", getRoleId())
.append("roleName", getRoleName())
@ -234,7 +234,7 @@ public class SysRole extends BaseEntity {
.append("deptCheckStrictly", isDeptCheckStrictly())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("createBy", SecurityUtils.getUsername())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())

82
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
View File

@ -137,172 +137,172 @@ public class SysUser extends BaseEntity {
*/
private Long roleId;
public SysUser (Long userId) {
public SysUser(Long userId) {
this.userId = userId;
}
public static boolean isAdmin (Long userId) {
public static boolean isAdmin(Long userId) {
return userId != null && 1L == userId;
}
public Long getUserId () {
public Long getUserId() {
return userId;
}
public void setUserId (Long userId) {
public void setUserId(Long userId) {
this.userId = userId;
}
public boolean isAdmin () {
public boolean isAdmin() {
return isAdmin(this.userId);
}
public Long getDeptId () {
public Long getDeptId() {
return deptId;
}
public void setDeptId (Long deptId) {
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
@Xss(message = "用户昵称不能包含脚本字符")
@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
public String getNickName () {
public String getNickName() {
return nickName;
}
public void setNickName (String nickName) {
public void setNickName(String nickName) {
this.nickName = nickName;
}
@Xss(message = "用户账号不能包含脚本字符")
@NotBlank(message = "用户账号不能为空")
@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
public String getUserName () {
public String getUserName() {
return userName;
}
public void setUserName (String userName) {
public void setUserName(String userName) {
this.userName = userName;
}
@Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
public String getEmail () {
public String getEmail() {
return email;
}
public void setEmail (String email) {
public void setEmail(String email) {
this.email = email;
}
@Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
public String getPhonenumber () {
public String getPhonenumber() {
return phonenumber;
}
public void setPhonenumber (String phonenumber) {
public void setPhonenumber(String phonenumber) {
this.phonenumber = phonenumber;
}
public String getSex () {
public String getSex() {
return sex;
}
public void setSex (String sex) {
public void setSex(String sex) {
this.sex = sex;
}
public String getAvatar () {
public String getAvatar() {
return avatar;
}
public void setAvatar (String avatar) {
public void setAvatar(String avatar) {
this.avatar = avatar;
}
public String getPassword () {
public String getPassword() {
return password;
}
public void setPassword (String password) {
public void setPassword(String password) {
this.password = password;
}
public String getStatus () {
public String getStatus() {
return status;
}
public void setStatus (String status) {
public void setStatus(String status) {
this.status = status;
}
public String getDelFlag () {
public String getDelFlag() {
return delFlag;
}
public void setDelFlag (String delFlag) {
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getLoginIp () {
public String getLoginIp() {
return loginIp;
}
public void setLoginIp (String loginIp) {
public void setLoginIp(String loginIp) {
this.loginIp = loginIp;
}
public Date getLoginDate () {
public Date getLoginDate() {
return loginDate;
}
public void setLoginDate (Date loginDate) {
public void setLoginDate(Date loginDate) {
this.loginDate = loginDate;
}
public SysDept getDept () {
public SysDept getDept() {
return dept;
}
public void setDept (SysDept dept) {
public void setDept(SysDept dept) {
this.dept = dept;
}
public List<SysRole> getRoles () {
public List<SysRole> getRoles() {
return roles;
}
public void setRoles (List<SysRole> roles) {
public void setRoles(List<SysRole> roles) {
this.roles = roles;
}
public Long[] getRoleIds () {
public Long[] getRoleIds() {
return roleIds;
}
public void setRoleIds (Long[] roleIds) {
public void setRoleIds(Long[] roleIds) {
this.roleIds = roleIds;
}
public Long[] getPostIds () {
public Long[] getPostIds() {
return postIds;
}
public void setPostIds (Long[] postIds) {
public void setPostIds(Long[] postIds) {
this.postIds = postIds;
}
public Long getRoleId () {
public Long getRoleId() {
return roleId;
}
public void setRoleId (Long roleId) {
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
@Override
public String toString () {
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId())
.append("deptId", getDeptId())
@ -317,7 +317,7 @@ public class SysUser extends BaseEntity {
.append("delFlag", getDelFlag())
.append("loginIp", getLoginIp())
.append("loginDate", getLoginDate())
.append("createBy", SecurityUtils.getUsername())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())