diff --git a/src/main/java/cn/lihongjie/coal/organization/dto/CreateOrganizationDto.java b/src/main/java/cn/lihongjie/coal/organization/dto/CreateOrganizationDto.java
index fae66e08..eb211aeb 100644
--- a/src/main/java/cn/lihongjie/coal/organization/dto/CreateOrganizationDto.java
+++ b/src/main/java/cn/lihongjie/coal/organization/dto/CreateOrganizationDto.java
@@ -8,4 +8,7 @@ import lombok.Data;
 public class CreateOrganizationDto extends CommonDto {
 
   private String parentId;
+
+    private String orgAdminUserName;
+    private String orgAdminPassword;
 }
diff --git a/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java b/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java
index 66d9a762..a9ed39be 100644
--- a/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java
+++ b/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java
@@ -9,6 +9,8 @@ import cn.lihongjie.coal.organization.dto.UpdateOrganizationDto;
 import cn.lihongjie.coal.organization.entity.OrganizationEntity;
 import cn.lihongjie.coal.organization.mapper.OrganizationMapper;
 import cn.lihongjie.coal.organization.repository.OrganizationRepository;
+import cn.lihongjie.coal.user.dto.CreateUserDto;
+import cn.lihongjie.coal.user.service.UserService;
 
 import jakarta.annotation.PostConstruct;
 
@@ -30,6 +32,8 @@ public class OrganizationService extends BaseService<OrganizationEntity, Organiz
     @Autowired OrganizationMapper mapper;
     @Autowired ConversionService conversionService;
 
+    @Autowired UserService userService;
+
     @PostConstruct
     public void init() {}
 
@@ -38,6 +42,13 @@ public class OrganizationService extends BaseService<OrganizationEntity, Organiz
         OrganizationEntity entity = mapper.toEntity(request);
 
         this.repository.save(entity);
+
+        CreateUserDto dto = new CreateUserDto();
+        dto.setOrganizationId(entity.getId());
+        dto.setUsername(request.getOrgAdminUserName());
+        dto.setPassword(request.getOrgAdminPassword());
+        userService.create(dto);
+
         return getById(entity.getId());
     }
 
diff --git a/src/main/java/cn/lihongjie/coal/permission/service/PermissionService.java b/src/main/java/cn/lihongjie/coal/permission/service/PermissionService.java
index b75cb2da..57a40f11 100644
--- a/src/main/java/cn/lihongjie/coal/permission/service/PermissionService.java
+++ b/src/main/java/cn/lihongjie/coal/permission/service/PermissionService.java
@@ -28,6 +28,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -119,12 +120,15 @@ public class PermissionService extends BaseService<PermissionEntity, PermissionR
 
             PermissionEntity permission =
                     dbPermissionMap
-                            .get(
+                            .getOrDefault(
                                     Tuple.of(
                                             exportDto.getCode(),
                                             exportDto.getName(),
-                                            exportDto.getParentName()))
-                            .get(0);
+                                            exportDto.getParentName()),
+                                    new ArrayList<>())
+                            .stream()
+                            .findAny()
+                            .orElse(null);
 
             if (permission == null) {