diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
index df10628..94ce16b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
@@ -4,11 +4,13 @@ package com.lyms.platform.operate.web.controller;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.LoginContext;
+import com.lyms.platform.common.base.PageInfo;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.exception.BusinessException;
 import com.lyms.platform.common.utils.Assert;
 import com.lyms.platform.common.utils.ResultUtils;
+import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
 import com.lyms.platform.operate.web.result.FrontEndResult;
 import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.service.*;
@@ -49,6 +51,8 @@ public class RolesController extends BaseController {
     private UserRoleMapsService userRoleMapsService;
     @Autowired
     private OrganizationService organizationService;
+    @Autowired
+    private AccessPermissionFacade  accessPermissionFacade;
 
     /**
      * 管理员角色权限配置
@@ -380,7 +384,7 @@ public class RolesController extends BaseController {
 
         limit = 200;
         page = page == null ? 1 : page;
-
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         RolesQuery rolesQuery = new RolesQuery();
         rolesQuery.setNeed("true");
         rolesQuery.setSort("modified desc");
@@ -391,17 +395,26 @@ public class RolesController extends BaseController {
         rolesQuery.setLimit(limit);
         rolesQuery.setEnable(enable);
         List list =new ArrayList();
-        if(StringUtils.isNotEmpty(orgIds)){
+       /* if(StringUtils.isNotEmpty(orgIds)){
             String[] as =orgIds.split(",");
             for(String a :as){
                 list.add(Integer.valueOf(a));
             }
         }
+*/
+
+
+        List<Organization> organizations = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(loginState.getId()));
+        if (CollectionUtils.isNotEmpty(organizations)) {
+            for (Organization organization : organizations) {
+                list .add(organization.getId());
+            }
+        }
         rolesQuery.setOrgIds(list);
         List<Roles> roles = rolesService.queryRoles(rolesQuery);
         List<Roles> rolesList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(roles)) {
-            LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+
             Users users = usersService.getUsers(loginState.getId());
             if (users.getType() == 2) {
                 rolesList.addAll(roles);
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 f1abe46..a2ab463 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
@@ -207,8 +207,20 @@ public class UsersController extends BaseController {
 
         List<Integer> ids = null;
         if (u.getType().equals(UserTypeEnum.NORMAL_USER.getId())) {
-            if (null != u.getOrgId()) {
-                orgId = u.getOrgId();
+//            if (null != u.getOrgId()) {
+//                orgId = u.getOrgId();
+//            } else {
+//                FrontEndResult frontEndResult = new FrontEndResult();
+//                frontEndResult.setPageInfo(new PageInfo(0, 0, 0, 10));
+//                frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
+//                return frontEndResult;
+//            }
+            List<Organization> organizations = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(u.getId()));
+            ids = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(organizations)) {
+                for (Organization organization : organizations) {
+                    ids.add(organization.getId());
+                }
             } else {
                 FrontEndResult frontEndResult = new FrontEndResult();
                 frontEndResult.setPageInfo(new PageInfo(0, 0, 0, 10));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
index c1fd2c6..44038cf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
@@ -49,7 +49,7 @@ public class HiskCountTask implements Callable {
 
         BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
         basicConfigQuery.setYn(YnEnums.YES.getId());
-        basicConfigQuery.setEnable(1);
+        //basicConfigQuery.setEnable(1);
         basicConfigQuery.setParentId(levelConfig.getId());
 
         List<RiskReportResult> results = new ArrayList<>();