|
|
@@ -79,11 +79,11 @@ public class UserInfo {
|
|
|
if (!CollectionUtils.isEmpty(currentRoles)) {
|
|
|
currentRoles.forEach( current -> {
|
|
|
if ("管理员".equals(current.getDesc())) {
|
|
|
- this.admin = true;
|
|
|
+ this.roleAdmin = true;
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- this.admin = this.admin == null ? false : this.admin;
|
|
|
+ this.roleAdmin = this.roleAdmin == null ? false : this.roleAdmin;
|
|
|
}
|
|
|
|
|
|
private Short countSecLevel(){
|
|
|
@@ -119,7 +119,7 @@ public class UserInfo {
|
|
|
return new PageImpl<UserInfo>(infos);
|
|
|
}
|
|
|
|
|
|
- private Boolean admin;
|
|
|
+ private Boolean roleAdmin;
|
|
|
|
|
|
private Long userUU;
|
|
|
|
|
|
@@ -154,11 +154,11 @@ public class UserInfo {
|
|
|
private String imageUrl;
|
|
|
|
|
|
public Boolean isAdmin() {
|
|
|
- return admin;
|
|
|
+ return roleAdmin;
|
|
|
}
|
|
|
|
|
|
public void setAdmin(Boolean admin) {
|
|
|
- this.admin = admin;
|
|
|
+ this.roleAdmin = admin;
|
|
|
}
|
|
|
|
|
|
public Integer getEmailValidCode() {
|