From d4202e0a054617cc1d18e5e5f92581cf9b07e1db Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 10:35:06 +0800
Subject: [PATCH] 执法结果上报

---
 project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
index 65cb3e9..48741d9 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
@@ -1,6 +1,9 @@
 package com.project.admin.controller.system;
 
 import com.project.common.config.ProjectConfig;
+import com.project.common.core.domain.entity.SysDept;
+import com.project.framework.web.service.SysPermissionService;
+import com.project.system.service.ISysDeptService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,6 +27,8 @@
 import com.project.framework.web.service.TokenService;
 import com.project.system.service.ISysUserService;
 
+import java.util.Set;
+
 /**
  * 涓汉淇℃伅 涓氬姟澶勭悊
  *
@@ -35,7 +40,9 @@
 public class SysProfileController extends BaseController
 {
     private final ISysUserService userService;
+    private final ISysDeptService deptService;
     private final TokenService tokenService;
+    private final SysPermissionService permissionService;
 
 
     /**
@@ -44,8 +51,17 @@
     @GetMapping
     public AjaxResult profile()
     {
-        SysUser user = userService.getById(getUserId());
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        SysDept sysDept = deptService.selectDeptById(userService.getById(user.getUserId()).getDeptId());
+        sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
+        user.setDept(sysDept);
+        // 瑙掕壊闆嗗悎
+        Set<String> roles = permissionService.getRolePermission(user);
+        // 鏉冮檺闆嗗悎
+        Set<String> permissions = permissionService.getMenuPermission(user);
         AjaxResult ajax = AjaxResult.success(user);
+        ajax.put("roles", roles);
+        ajax.put("permissions", permissions);
         ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName()));
         ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName()));
         return ajax;

--
Gitblit v1.9.1