diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java
index 5ad9e88..b263ea3 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java
@@ -2,15 +2,18 @@ package com.shxy.xymanager_admin.controller;
 
 
 import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.bean.PermissionDetail;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
 import com.shxy.xymanager_common.bean.SysUser;
 import com.shxy.xymanager_common.entity.SysUserSession;
 import com.shxy.xymanager_common.page.TableDataInfo;
+import com.shxy.xymanager_common.threadlocal.UserContextHolder;
 import com.shxy.xymanager_common.vo.PageVo;
 import com.shxy.xymanager_common.vo.SysUserUpdateVo;
 import com.shxy.xymanager_common.vo.SysUserVo;
 import com.shxy.xymanager_service.service.LoginService;
+import com.shxy.xymanager_service.service.RoleService;
 import com.shxy.xymanager_service.service.SysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,6 +35,9 @@ public class SysLoginController {
     @Autowired
     SysUserService sysUserService;
 
+    @Autowired
+    RoleService roleService;
+
     /**
      * @Description 登录方法
      *
@@ -50,6 +56,27 @@ public class SysLoginController {
         }
     }
 
+    /**
+     * @Description 获取当前用户
+     *
+     * @param
+     * @return ResponseReult
+     */
+    @ApiOperation(value = "获取当前用户", notes = "获取当前用户", httpMethod = "GET")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/currentUser")
+    public ResponseReult<SysUser> currentUser() throws Exception {
+        SysUser user = UserContextHolder.currentUserInfo();
+        if (user != null) {
+            user.setPassword("");
+            PermissionDetail permission = roleService.getPermissionList();
+            user.setPermission(permission);
+            return ResponseReult.success(user);
+        } else {
+            return ResponseReult.error(ServiceStatus.ERROR, "未获取到当前用户信息");
+        }
+    }
+
     /**
      * 新增用户
      *
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/SysUser.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/SysUser.java
index 2dd5db8..d249f70 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/SysUser.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/SysUser.java
@@ -56,4 +56,7 @@ public class SysUser {
      */
     @ApiModelProperty(value="角色名称", name="rolename")
     private String roleName;
+
+    @ApiModelProperty(value="权限信息")
+    PermissionDetail permission;
 }