diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AccountAddRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AccountAddRequest.java index 3dfd6dce..b18e8c1d 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AccountAddRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AccountAddRequest.java @@ -54,4 +54,9 @@ public class AccountAddRequest { */ @JsonProperty("isGongFuHandler") private boolean isGongFuHandler = false; + + /** + * 直销类别(国内、国外),字典id + */ + private Long categoryId; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminUserVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminUserVO.java index 9c153e9c..1dedc6ef 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminUserVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminUserVO.java @@ -84,5 +84,15 @@ public class AdminUserVO { @JsonProperty("isGongfu") private boolean isGongfu; + /** + * 直销类别(国内、国外),字典id + */ + private Long categoryId; + + /** + * 直销类别 + */ + private String categoryName; + private List children = new ArrayList<>(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java index d594a7d2..dd17a917 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java @@ -132,4 +132,9 @@ public class AdminUser implements Serializable { */ @TableField("is_gongfu") private boolean gongfu; + + /** + * 直销类别(国内、国外),字典id + */ + private Long categoryId; } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java index 8aacf2e1..b4a01309 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java @@ -67,6 +67,9 @@ public class AdminUserServiceImpl extends ServiceImpl users = lambdaQuery().list(); List roleMaps = adminUserRoleMapService.lambdaQuery().list(); List roles = roleService.lambdaQuery().list(); + List categories = dictionaryItemService.lambdaQuery() + .in(DictionaryItem::getId, page.getRecords().stream() + .map(AdminUser::getCategoryId) + .filter(Objects::nonNull) + .collect(Collectors.toList()) + ).list(); pageData.setItems(page.getRecords().stream().map(u -> { AdminUser userCreate = users.stream() .filter(it -> Objects.equals(it.getId(), u.getCreateBy())) @@ -188,6 +199,10 @@ public class AdminUserServiceImpl extends ServiceImpl Objects.equals(it.getUserId(), u.getId())) .map(AdminUserRoleMap::getRoleId) .collect(Collectors.toSet()); + DictionaryItem category = categories.stream() + .filter(c -> Objects.equals(c.getId(), u.getCategoryId())) + .findFirst() + .orElse(null); return new AdminUserVO() .setId(u.getId()) .setUserCode(u.getUserCode()) @@ -209,6 +224,8 @@ public class AdminUserServiceImpl extends ServiceImpl rmaps.contains(r.getId()))