diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index 76a02a6..4b8dfa8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -45,7 +45,10 @@ public class UsersController extends BaseController {
     private String token;
     @Value("#{configProperties['login.typeId']}")
     private String typeId;
-
+    @Autowired
+    private RolePermissionMapsService rolePermissionMapsService;
+    @Autowired
+    private PermissionsService permissionsService;
 
     private static final String LYMS = "龙源美生";
 
@@ -192,17 +195,32 @@ public class UsersController extends BaseController {
             users = usersService.getUsers(loginContext.getId());
         }
 
+        //获取用户角色信息
         UserRoleMapsQuery query = new UserRoleMapsQuery();
         query.setUserId(users.getId());
         query.setYn(YnEnums.YES.getId());
         List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query);
         List<Roles> roles = new ArrayList<>();
+        List<Permissions> permissions = new ArrayList<>();
+        RolePermissionMapsQuery rolePermissionMapsQuery ;
         for(UserRoleMaps roleMaps : userRoleMapses) {
             roles.add(rolesService.getRoles(roleMaps.getRoleId()));
+
+            //获取角色权限信息
+            rolePermissionMapsQuery = new RolePermissionMapsQuery();
+            rolePermissionMapsQuery.setRoleId(roleMaps.getRoleId());
+            rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
+            List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
+            for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
+                permissions.add(permissionsService.getPermissions(rolePermissionMaps.getPermissionId()));
+            }
         }
+
+
         Map<String, Object> map = new HashMap<>();
         map.put("user", users);
         map.put("roles", roles);
+        map.put("permissions", permissions);
 
         ResultUtils.buildSuccessResultAndWrite(response, map);
     }