diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
index 4a5af31..3b4cf34 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
@@ -96,6 +96,7 @@ public class DepartmentsController extends   BaseController {
         if(!departments.getName().equals(name)) {
             DepartmentsQuery departmentsQuery = new DepartmentsQuery();
             departments.setYn(YnEnums.YES.getId());
+            departments.setOrgId(orgId);
             departmentsQuery.setName(name);
             if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) {
                 ResultUtils.buildParameterErrorResultAndWrite(response,"该部门已存在");
@@ -145,6 +146,7 @@ public class DepartmentsController extends   BaseController {
         }
         DepartmentsQuery departmentsQuery = new DepartmentsQuery();
         departmentsQuery.setName(name);
+        departmentsQuery.setOrgId(orgId);
         departmentsQuery.setYn(YnEnums.YES.getId());
         departmentsQuery.setOrgId(orgId);
         if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
index cf4504f..5a50fb0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
@@ -87,7 +87,7 @@ public class RegionController extends BaseController{
         }
 
 
-        if (user.getType().equals(2) || user.getType().equals(0) && ("0".equals(parentId) || StringUtils.isBlank(parentId))) {
+        if ((user.getType().equals(2) || user.getType().equals(0)) && ("0".equals(parentId) || StringUtils.isBlank(parentId))) {
             parentId = SystemConfig.CHINA_BASIC_ID;
             query.setParentId(parentId);
         }
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 a94c4ab..34b10d5 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
@@ -298,39 +298,53 @@ public class UsersController extends BaseController {
             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<Roles> roles = new ArrayList<>();
         List<Permissions> permissions = null;
-        RolePermissionMapsQuery rolePermissionMapsQuery ;
-        List<Integer> permissionIds = new ArrayList<>();
-        for(Integer roleMaps : userRoleMapses) {
-            roles.add(rolesService.getRoles(roleMaps));
-
-            //获取角色权限信息
-            rolePermissionMapsQuery = new RolePermissionMapsQuery();
-            rolePermissionMapsQuery.setRoleId(roleMaps);
-            rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
-            List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
-
-            for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
-                Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId());
-                if(null != permissions1) {
-                    if(null == permissions) {
-                        permissions = new ArrayList<>();
-                    }
-                    if(!permissionIds.contains(permissions1.getId())) {
-                        permissions.add(permissions1);
-                        permissionIds.add(permissions1.getId());
+        List<Roles> roles = new ArrayList<>();
+        //超级管理员拥有所有角色和权限
+        if(users.getType().equals(2)) {
+            RolesQuery rolesQuery = new RolesQuery();
+            rolesQuery.setYn(YnEnums.YES.getId());
+            roles = rolesService.queryRoles(rolesQuery);
+
+            PermissionsQuery permissionsQuery = new PermissionsQuery();
+            permissionsQuery.setYn(YnEnums.YES.getId());
+            permissions = permissionsService.queryPermissions(permissionsQuery);
+
+
+        }
+        //其他用户
+        else if(users.getType().equals(0) || users.getType().equals(1)){
+            //获取用户角色信息
+            UserRoleMapsQuery query = new UserRoleMapsQuery();
+            query.setUserId(users.getId());
+            query.setYn(YnEnums.YES.getId());
+            List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query);
+            RolePermissionMapsQuery rolePermissionMapsQuery ;
+            List<Integer> permissionIds = new ArrayList<>();
+            for(Integer roleMaps : userRoleMapses) {
+                roles.add(rolesService.getRoles(roleMaps));
+
+                //获取角色权限信息
+                rolePermissionMapsQuery = new RolePermissionMapsQuery();
+                rolePermissionMapsQuery.setRoleId(roleMaps);
+                rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
+                List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
+
+                for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
+                    Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId());
+                    if(null != permissions1) {
+                        if(null == permissions) {
+                            permissions = new ArrayList<>();
+                        }
+                        if(!permissionIds.contains(permissions1.getId())) {
+                            permissions.add(permissions1);
+                            permissionIds.add(permissions1.getId());
+                        }
                     }
                 }
             }
         }
 
-
         Map<String, Object> map = new HashMap<>();
         map.put("user", users);
         map.put("roles", roles);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java
index b99b5fe..52a22d0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java
@@ -45,9 +45,9 @@ public class BasicConfigAddRequest implements IBasicRequestConvert<BasicConfig>{
     @Override
     public BasicConfig convertToDataModel() {
         BasicConfig basicConfig = new BasicConfig();
-        if(StringUtils.isEmpty(code)){
-            return null;
-        }
+//        if(StringUtils.isEmpty(code)){
+//            return null;
+//        }
         if(StringUtils.isEmpty(name)){
             return null;
         }