diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
index 3a8bd89..7ffc7dc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
@@ -124,10 +124,21 @@ public class OrganizationController extends BaseController {
         //判断ID是否存在
         Organization organization = organizationService.getOrganization(id);
         if (null == organization) {
-            ResultUtils.buildParameterErrorResultAndWrite(response, "id不存在!");
+            ResultUtils.buildParameterErrorResultAndWrite(response, "机构不存在!");
             return;
         }
 
+        if(!organization.getName().equals(name)) {
+            OrganizationQuery organizationQuery = new OrganizationQuery();
+            organizationQuery.setYn(YnEnums.YES.getId());
+            organizationQuery.setName(name);
+            if (0 < organizationService.queryOrganizationCount(organizationQuery)) {
+                ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST, "机构名称已存在!");
+                return;
+            }
+        }
+
+
         organization.setName(name);
         organization.setType(type);
         organization.setLevel(level);
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 2249579..6111ff1 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
@@ -111,12 +111,19 @@ public class UsersController extends BaseController {
     @TokenRequired
     @ResponseBody
     public FrontEndResult getPermissions(HttpServletResponse response,
+                                         HttpServletRequest request,
                                @RequestParam(value = "keyword", required = false) String keyword,
                                @RequestParam(value = "rolesId", required = false) Integer rolesId,
                                @RequestParam(value = "page", required = false) Integer page,
                                @RequestParam(value = "limit", required = false) Integer limit,
                                @RequestParam(value = "orgId", required = false) Integer orgId,
                                @RequestParam(value = "deptId", required = false) Integer deptId) {
+        LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
+        Users u = usersService.getUsers(loginContext.getId());
+        if(u.getType().equals(1)) {
+            orgId = u.getOrgId();
+        }
+
 
         limit = limit == null ? 10 : limit;
         page = page == null ? 1 : page;