diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
index 826d65f..6787eba 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.permission.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class Users {
     private Integer id;
@@ -21,6 +22,38 @@ public class Users {
     private String remarks;
     private Date lastLoginTime;
 
+
+    private List<Roles> roles;
+    private Departments departmentses;
+    private Organization organization;
+
+
+    public Departments getDepartmentses() {
+        return departmentses;
+    }
+
+    public void setDepartmentses(Departments departmentses) {
+        this.departmentses = departmentses;
+    }
+
+    public Organization getOrganization() {
+        return organization;
+    }
+
+    public void setOrganization(Organization organization) {
+        this.organization = organization;
+    }
+
+    public List<Roles> getRoles() {
+        return roles;
+    }
+
+    public void setRoles(List<Roles> roles) {
+        this.roles = roles;
+    }
+
+
+
     public Integer getId() {
         return id;
     }
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 1e99f4e..76a02a6 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
@@ -53,10 +53,6 @@ public class UsersController extends BaseController {
 
 
 
-
-
-
-
     /**
      * 获取列表
      */
@@ -85,10 +81,30 @@ public class UsersController extends BaseController {
         //TODO 这里查询未完成 模糊查询
 
         List<Users> users = usersService.queryUsers(usersQuery);
+
+        //设置用户角色信息
+        for(Users user : users) {
+            user.setRoles(this.getUserRoles(user.getId()));
+            user.setOrganization(organizationService.getOrganization(user.getId()));
+            user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
+        }
+
+
         ResultUtils.buildSuccessResultAndWrite(response, users);
     }
 
-
+    //获取用户角色信息
+    private  List<Roles> getUserRoles(Integer userId) {
+        UserRoleMapsQuery query = new UserRoleMapsQuery();
+        query.setUserId(userId);
+        query.setYn(YnEnums.YES.getId());
+        List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query);
+        List<Roles> roles = new ArrayList<>();
+        for(UserRoleMaps roleMaps : userRoleMapses) {
+            roles.add(rolesService.getRoles(roleMaps.getRoleId()));
+        }
+        return roles;
+    }
 
 
     /**