提交 ce610765 编写于 作者: 智布道's avatar 智布道 👁 提交者: Gitee

!23 管理端用户类型枚举中英互换

Merge pull request !23 from liangguifeng/master
...@@ -11,8 +11,8 @@ import java.util.Date; ...@@ -11,8 +11,8 @@ import java.util.Date;
/** /**
* @author yadong.zhang (yadong.zhang0415(a)gmail.com) * @author yadong.zhang (yadong.zhang0415(a)gmail.com)
* @website https://docs.zhyd.me
* @version 1.0 * @version 1.0
* @website https://docs.zhyd.me
* @date 2018/4/16 16:26 * @date 2018/4/16 16:26
* @since 1.0 * @since 1.0
*/ */
...@@ -178,6 +178,10 @@ public class User extends AbstractBO { ...@@ -178,6 +178,10 @@ public class User extends AbstractBO {
return UserTypeEnum.getByType(this.sysUser.getUserType()); return UserTypeEnum.getByType(this.sysUser.getUserType());
} }
public Object getUserTypeDescEnum() {
return UserTypeEnum.getByTypeDesc(this.sysUser.getUserType());
}
public String getCompany() { public String getCompany() {
return this.sysUser.getCompany(); return this.sysUser.getCompany();
} }
......
...@@ -4,8 +4,8 @@ import org.springframework.util.StringUtils; ...@@ -4,8 +4,8 @@ import org.springframework.util.StringUtils;
/** /**
* @author yadong.zhang (yadong.zhang0415(a)gmail.com) * @author yadong.zhang (yadong.zhang0415(a)gmail.com)
* @website https://docs.zhyd.me
* @version 1.0 * @version 1.0
* @website https://docs.zhyd.me
* @date 2018/4/16 16:26 * @date 2018/4/16 16:26
* @since 1.0 * @since 1.0
*/ */
...@@ -32,6 +32,20 @@ public enum UserTypeEnum { ...@@ -32,6 +32,20 @@ public enum UserTypeEnum {
return UserTypeEnum.UNKNOW; 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() { public String getDesc() {
return desc; return desc;
} }
......
...@@ -179,6 +179,7 @@ public class SysUserServiceImpl implements SysUserService { ...@@ -179,6 +179,7 @@ public class SysUserServiceImpl implements SysUserService {
} }
List<User> users = new ArrayList<>(); List<User> users = new ArrayList<>();
for (SysUser su : sysUsers) { for (SysUser su : sysUsers) {
su.setUserType(new User(su).getUserTypeDescEnum().toString());
users.add(new User(su)); users.add(new User(su));
} }
return users; return users;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册