diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
index e59267e..195c504 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
@@ -13,10 +13,12 @@ import com.lyms.platform.common.utils.Assert;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.common.utils.ResultUtils;
 import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
+import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.request.AccessPermissionAddRequest;
 import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.service.*;
 import com.lyms.platform.pojo.DataPermissionsModel;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,21 +40,9 @@ public class PermissionsController extends BaseController {
     private Permissions2Service permissions2Service;
     @Autowired
     private UsersService usersService;
-
-    @Autowired
-    private DepartmentsService departmentsService;
-    @Autowired
-    private TokenService tokenService;
     @Autowired
     private UserRoleMapsService userRoleMapsService;
     @Autowired
-    private RolePermissionMapsService rolePermissionMapsService;
-
-    private static  String NODE="children";
-    private static String CHECK="check";
-
-    private Integer TYPE = 1;
-    @Autowired
     private AccessPermissionFacade accessPermissionFacade;
 
 
@@ -63,8 +53,8 @@ public class PermissionsController extends BaseController {
     @TokenRequired
     public void getPermissions(HttpServletResponse response,
                                @RequestParam(value = "id", required = false) Integer id,
-                               @RequestParam(value = "page",required = false) Integer page,
-                               @RequestParam(value = "limit",required = false) Integer limit) {
+                               @RequestParam(value = "page", required = false) Integer page,
+                               @RequestParam(value = "limit", required = false) Integer limit) {
         Permissions2Query permissionsQuery = new Permissions2Query();
         page = null == page ? 1 : page;
         limit = null == limit ? 10 : limit;
@@ -79,17 +69,58 @@ public class PermissionsController extends BaseController {
     }
 
 
+    /**
+     * 获取权限列表
+     */
+    @RequestMapping(value = "/current/permissions", method = RequestMethod.GET)
+    @TokenRequired
+    public void getCurrentPermissions(HttpServletResponse response, HttpServletRequest request) {
+    /*    Permissions2Query permissionsQuery = new Permissions2Query();
+        page = null == page ? 1 : page;
+        limit = null == limit ? 10 : limit;
+        permissionsQuery.setNeed("true");
+        permissionsQuery.setPage(page);
+        permissionsQuery.setId(id);
+        permissionsQuery.setLimit(limit);
+        permissionsQuery.setYn(YnEnums.YES.getId());
+        List<Permissions2> permissionses = permissions2Service.queryPermissions2(permissionsQuery);
+*/
+        LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
+        Users users = null;
+        if (null != loginContext) {
+            users = usersService.getUsers(loginContext.getId());
+        }
+
+        //获取用户角色信息
+        UserRoleMapsQuery query = new UserRoleMapsQuery();
+        query.setUserId(users.getId());
+        query.setYn(YnEnums.YES.getId());
+        List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query);
+        List<Integer> permissionIds = new ArrayList<>();
+        List permissions = new ArrayList<>();
+
+        List<Permissions2> local = permissions2Service.queryPermissionByRoleIds(userRoleMapses);
+        if (CollectionUtils.isNotEmpty(local)) {
+            for (Permissions2 permissions1 : local) {
+                if (!permissionIds.contains(permissions1.getId())) {
+                    permissionIds.add(permissions1.getId());
+                    permissions.add(permissions1);
+                }
+            }
+        }
+        ResultUtils.buildSuccessResultAndWrite(response, permissions);
+    }
 
 
     @TokenRequired
     @RequestMapping(value = "/accesspermissions", method = RequestMethod.GET)
     @ResponseBody
-    public List getAccessPermission(){
-        List<Map<String,Object>> list = new ArrayList<>();
-        for(PermissionTypeEnums permissionTypeEnums:PermissionTypeEnums.values()){
-            Map<String,Object>  data =  new HashMap<String,Object>();
-            data.put("id",permissionTypeEnums.getId());
-            data.put("title",permissionTypeEnums.getTitle());
+    public List getAccessPermission() {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (PermissionTypeEnums permissionTypeEnums : PermissionTypeEnums.values()) {
+            Map<String, Object> data = new HashMap<String, Object>();
+            data.put("id", permissionTypeEnums.getId());
+            data.put("title", permissionTypeEnums.getTitle());
             list.add(data);
         }
         return list;
@@ -98,12 +129,11 @@ public class PermissionsController extends BaseController {
     @TokenRequired
     @RequestMapping(value = "/accesspermissions", method = RequestMethod.POST)
     @ResponseBody
-    public BaseResponse addDataAccessPermission(@Valid AccessPermissionAddRequest accessPermissionAddRequest){
+    public BaseResponse addDataAccessPermission(@Valid AccessPermissionAddRequest accessPermissionAddRequest) {
         return accessPermissionFacade.addAccessPermission(accessPermissionAddRequest);
     }
 
 
-
     /**
      * 新增权限
      * name;