diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 6932c7a..7263ba4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2853,18 +2853,18 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_ACCOUNT_TYPE { - SYSTEM_USER(10, "系统用户"), - SWEB_USER(20, "sweb用户"); + SYSTEM("SYSTEM", "系统用户"), + SWEB("SWEB", "sweb用户"); - private int value; + private String value; private String description; - USER_ACCOUNT_TYPE(int value, String description) { + USER_ACCOUNT_TYPE(String value, String description) { this.value = value; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -2872,19 +2872,28 @@ public class CommonEnumUtil { return description; } - public static String valueOf(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equalsIgnoreCase(val)) { tmp = values()[i].description; } } return tmp; } + public static USER_ACCOUNT_TYPE valueOfEnum(String val) { + USER_ACCOUNT_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equalsIgnoreCase(val)) { + tmp = values()[i]; + } + } + return tmp; + } - public static Integer descriptionOfValue(String desc) { - Integer tmp = null; + public static String descriptionOfValue(String desc) { + String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].description.equals(desc)) { tmp = values()[i].value; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 901f40b..571f83b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -166,6 +166,11 @@ public class UserDetailModel extends BaseBean { @ApiParam(value = "登录平台权限") private String authPlatform; + + @ApiParam(value = "账号类型") + private String userAccountType; + + public SysUser getSysUser(){ SysUser user = new SysUser(); user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null); @@ -180,6 +185,7 @@ public class UserDetailModel extends BaseBean { user.setOrganizeCode(this.organizeCode); user.setUserLoginNum(this.userLoginNum); user.setAuthPlatform(this.authPlatform); + user.setUserAccountType(this.userAccountType); return user; }