diff --git a/app/controllers/organizations/organizations_controller.rb b/app/controllers/organizations/organizations_controller.rb
index 73335cf11..09c12fd5a 100644
--- a/app/controllers/organizations/organizations_controller.rb
+++ b/app/controllers/organizations/organizations_controller.rb
@@ -25,6 +25,7 @@ class Organizations::OrganizationsController < Organizations::BaseController
 
   def create
     ActiveRecord::Base.transaction do
+      Organizations::CreateForm.new(organization_params).validate!
       @organization = Organizations::CreateService.call(current_user, organization_params)
       Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
     end
diff --git a/app/controllers/organizations/teams_controller.rb b/app/controllers/organizations/teams_controller.rb
index 5bc01fe39..a8d06ce46 100644
--- a/app/controllers/organizations/teams_controller.rb
+++ b/app/controllers/organizations/teams_controller.rb
@@ -33,7 +33,10 @@ class Organizations::TeamsController < Organizations::BaseController
   end
 
   def create
-    @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
+    ActiveRecord::Base.transaction do
+      Organizations::CreateTeamForm.new(team_params).validate!
+      @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
+    end
   rescue Exception => e
     uid_logger_error(e.message)
     tip_exception(e.message)
@@ -60,7 +63,7 @@ class Organizations::TeamsController < Organizations::BaseController
 
   private
   def team_params
-    params.permit(:name, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types => [])
+    params.permit(:name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types => [])
   end
 
   def load_organization
diff --git a/app/forms/organizations/create_form.rb b/app/forms/organizations/create_form.rb
new file mode 100644
index 000000000..00c1dd15e
--- /dev/null
+++ b/app/forms/organizations/create_form.rb
@@ -0,0 +1,8 @@
+class Organizations::CreateForm < BaseForm
+  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+  attr_accessor :name, :description, :website, :location, :repo_admin_change_team_access, :visibility, :max_repo_creation, :nickname
+
+  validates :name, :nickname, :visibility, presence: true
+  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
+
+end
diff --git a/app/forms/organizations/create_team_form.rb b/app/forms/organizations/create_team_form.rb
new file mode 100644
index 000000000..898d69a1d
--- /dev/null
+++ b/app/forms/organizations/create_team_form.rb
@@ -0,0 +1,8 @@
+class Organizations::CreateTeamForm < BaseForm
+  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+  attr_accessor :name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types
+
+  validates :name, :nickname, :authorize, presence: true
+  validates :name, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
+
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index 9aa6283f6..4b96ab2b2 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -161,6 +161,7 @@ class Project < ApplicationRecord
 
   #创建项目管理员
   def check_project_members
+    return if owner.is_a?(Organization)
     unless members.present? && members.exists?(user_id: self.user_id)
       member_params = {
         user_id: self.user_id,
diff --git a/app/models/team.rb b/app/models/team.rb
index 82a3e88c1..d17827da8 100644
--- a/app/models/team.rb
+++ b/app/models/team.rb
@@ -14,6 +14,7 @@
 #  gtid                   :integer
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
+#  nickname               :string(255)
 #
 # Indexes
 #
diff --git a/app/services/organizations/teams/update_service.rb b/app/services/organizations/teams/update_service.rb
index 71c82c40b..b5b273d8a 100644
--- a/app/services/organizations/teams/update_service.rb
+++ b/app/services/organizations/teams/update_service.rb
@@ -27,7 +27,7 @@ class Organizations::Teams::UpdateService < ApplicationService
     if team.authorize == "owner"
       update_params = params.slice(:description)
     else
-      update_params = params.slice(:name, :description, :authorize, :includes_all_project, :can_create_org_project)
+      update_params = params.slice(:name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project)
     end
     update_params
   end
diff --git a/app/views/organizations/organizations/_detail.json.jbuilder b/app/views/organizations/organizations/_detail.json.jbuilder
index 64feadca1..4a8b512b9 100644
--- a/app/views/organizations/organizations/_detail.json.jbuilder
+++ b/app/views/organizations/organizations/_detail.json.jbuilder
@@ -1,6 +1,6 @@
 json.id organization.id
 json.name organization.login
-json.nickname organization.nickname
+json.nickname organization.nickname.blank? ? organization.name : organization.nickname
 json.description organization.description
 json.website organization.website
 json.location organization.location
diff --git a/app/views/organizations/teams/_detail.json.jbuilder b/app/views/organizations/teams/_detail.json.jbuilder
index 4f3588cb9..68572814f 100644
--- a/app/views/organizations/teams/_detail.json.jbuilder
+++ b/app/views/organizations/teams/_detail.json.jbuilder
@@ -1,5 +1,6 @@
 json.id team.id
 json.name team.name
+json.nickname team.nickname.blank? ? team.name : team.nickname
 json.description team.description
 json.authorize team.authorize
 json.includes_all_project team.includes_all_project
diff --git a/db/migrate/20210419023310_add_nickname_to_teams.rb b/db/migrate/20210419023310_add_nickname_to_teams.rb
new file mode 100644
index 000000000..ed80f1935
--- /dev/null
+++ b/db/migrate/20210419023310_add_nickname_to_teams.rb
@@ -0,0 +1,5 @@
+class AddNicknameToTeams < ActiveRecord::Migration[5.2]
+  def change
+    add_column :teams, :nickname, :string
+  end
+end