From f17a3980d0dfec11c1db69503e930fa20b6684f8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 11:17:39 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java | 14 ++++++++++++++
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminHomePageInfoVo.java | 5 +++++
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
index 55bdc41..ffe82d9 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
@@ -401,9 +401,23 @@
@Override
public Result viewHomePage() {
+ UserEntity loginUser = LoginUserUtil.getLoginUser();
Long companyId = LoginUserUtil.getCompanyId();
+
AdminHomePageInfoVo adminHomePageInfoVo = new AdminHomePageInfoVo();
+ QueryWrapper<UserRoleEntity> userRoleQueryWrapper = new QueryWrapper<>();
+ userRoleQueryWrapper.eq("user_id",loginUser.getId());
+ List<UserRoleEntity> userRoleEntities = userRoleMapper.selectList(userRoleQueryWrapper);
+ if(CollUtil.isNotEmpty(userRoleEntities)){
+ List<String> roleNames = new ArrayList<>();
+ for(UserRoleEntity userRoleEntity : userRoleEntities){
+ RoleEntity roleEntity = roleMapper.selectById(userRoleEntity.getRoleId());
+ roleNames.add(roleEntity.getRoleName());
+ }
+ adminHomePageInfoVo.setRoleNames(roleNames);
+ }
+
QueryWrapper<ColumnEntity> columnQueryWrapper = new QueryWrapper<>();
columnQueryWrapper.eq("company_id",companyId);
adminHomePageInfoVo.setColumnNum(columnMapper.selectCount(columnQueryWrapper));
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminHomePageInfoVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminHomePageInfoVo.java
index c059eb7..bad310e 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminHomePageInfoVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminHomePageInfoVo.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
@Data
@ApiModel(value = "AdminHomePageInfoVo", description = "首页信息返回")
public class AdminHomePageInfoVo {
@@ -17,4 +19,7 @@
@ApiModelProperty(value = "留言数量")
private Integer messageNum;
+ @ApiModelProperty(value = "角色")
+ private List<String> roleNames;
+
}
--
Gitblit v1.9.1