From ae9c981829507e186de54e88511ca7ebbaddc103 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 11 Apr 2020 22:18:29 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/springblade/system/user/vo/UserVO.java | 5 +++++ .../java/org/springblade/system/wrapper/PostWrapper.java | 2 +- .../org/springblade/system/user/wrapper/UserWrapper.java | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java index 5bdf7544..eb59a77b 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java @@ -55,6 +55,11 @@ public class UserVO extends User { */ private String deptName; + /** + * 岗位名 + */ + private String postName; + /** * 性别 */ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/PostWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/PostWrapper.java index 9ab6070a..455e750f 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/PostWrapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/PostWrapper.java @@ -38,7 +38,7 @@ public class PostWrapper extends BaseEntityWrapper { @Override public PostVO entityVO(Post post) { PostVO postVO = Objects.requireNonNull(BeanUtil.copy(post, PostVO.class)); - String categoryName = DictCache.getValue("post", post.getCategory()); + String categoryName = DictCache.getValue("post_category", post.getCategory()); postVO.setCategoryName(categoryName); return postVO; } diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/wrapper/UserWrapper.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/wrapper/UserWrapper.java index 10b2478e..49a07c40 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/wrapper/UserWrapper.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/wrapper/UserWrapper.java @@ -45,9 +45,11 @@ public class UserWrapper extends BaseEntityWrapper { Tenant tenant = SysCache.getTenant(user.getTenantId()); List roleName = SysCache.getRoleNames(user.getRoleId()); List deptName = SysCache.getDeptNames(user.getDeptId()); + List postName = SysCache.getPostNames(user.getPostId()); userVO.setTenantName(tenant.getTenantName()); userVO.setRoleName(Func.join(roleName)); userVO.setDeptName(Func.join(deptName)); + userVO.setPostName(Func.join(postName)); String sex = DictCache.getValue("sex", Func.toInt(user.getSex())); userVO.setSexName(sex); return userVO;