diff --git a/blog-core/src/main/java/com/zyd/blog/business/entity/User.java b/blog-core/src/main/java/com/zyd/blog/business/entity/User.java index 2b6ec7fe678853a656e6ef3a65c43f33b418b4e4..2a6445bd9a4751924bff13072283786a718b4ebf 100644 --- a/blog-core/src/main/java/com/zyd/blog/business/entity/User.java +++ b/blog-core/src/main/java/com/zyd/blog/business/entity/User.java @@ -11,8 +11,8 @@ import java.util.Date; /** * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @website https://docs.zhyd.me * @version 1.0 + * @website https://docs.zhyd.me * @date 2018/4/16 16:26 * @since 1.0 */ @@ -178,6 +178,10 @@ public class User extends AbstractBO { return UserTypeEnum.getByType(this.sysUser.getUserType()); } + public Object getUserTypeDescEnum() { + return UserTypeEnum.getByTypeDesc(this.sysUser.getUserType()); + } + public String getCompany() { return this.sysUser.getCompany(); } diff --git a/blog-core/src/main/java/com/zyd/blog/business/enums/UserTypeEnum.java b/blog-core/src/main/java/com/zyd/blog/business/enums/UserTypeEnum.java index 5a55430efa9e0f63bd23d037d30bc5b05016342a..e8969aa8cdf92415ee640cf63f5b4d3b6c377cd7 100644 --- a/blog-core/src/main/java/com/zyd/blog/business/enums/UserTypeEnum.java +++ b/blog-core/src/main/java/com/zyd/blog/business/enums/UserTypeEnum.java @@ -4,8 +4,8 @@ import org.springframework.util.StringUtils; /** * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @website https://docs.zhyd.me * @version 1.0 + * @website https://docs.zhyd.me * @date 2018/4/16 16:26 * @since 1.0 */ @@ -32,6 +32,20 @@ public enum UserTypeEnum { return UserTypeEnum.UNKNOW; } + public static String getByTypeDesc(String type) { + if (StringUtils.isEmpty(type)) { + return UserTypeEnum.UNKNOW.getDesc(); + } + + for (UserTypeEnum ut : UserTypeEnum.values()) { + if (ut.toString().equalsIgnoreCase(type)) { + return ut.getDesc(); + } + } + + return UserTypeEnum.UNKNOW.getDesc(); + } + public String getDesc() { return desc; } diff --git a/blog-core/src/main/java/com/zyd/blog/business/service/impl/SysUserServiceImpl.java b/blog-core/src/main/java/com/zyd/blog/business/service/impl/SysUserServiceImpl.java index 201cf44c55619f48e04fe4ecf80e160c81ebc262..3e54a4721bfe0cfcd24d4606ef0663cd2ca2040a 100644 --- a/blog-core/src/main/java/com/zyd/blog/business/service/impl/SysUserServiceImpl.java +++ b/blog-core/src/main/java/com/zyd/blog/business/service/impl/SysUserServiceImpl.java @@ -179,6 +179,7 @@ public class SysUserServiceImpl implements SysUserService { } List users = new ArrayList<>(); for (SysUser su : sysUsers) { + su.setUserType(new User(su).getUserTypeDescEnum().toString()); users.add(new User(su)); } return users;