Merge pull request '【苏州大学】协同开发调整(#11588)' (#406) from kikiwww/forgeplus:dev_edu_local_suzhoudaxue into dev_edu_local_suzhoudaxue

app/models/project.rb

@@ -143,11 +143,16 @@ class Project < ApplicationRecord
   delegate :name, to: :license, prefix: true, allow_nil: true
 
   def create_project_review
-    if ProjectReview.where(project_id:self.id).present?
-      raise "此项目已经申请过了"
+    user = User.find_by(id:self.user_id)
+    if user.admin_or_business?
+      self.audit_statu = 2
+      self.save
+      return
     end
-    de = Declaration.create(user_id: self.user_id,status:0,declare_type:16)
-    de.project_reviews.create(project_id: self.id)
+    de = Declaration.find_or_create_by(user_id: self.user_id,declare_type:16)
+    de.status = 0
+    de.project_reviews.find_or_create_by(project_id: self.id)
+    de.save
     self.audit_statu = 1
     self.save
   end

app/services/projects/migrate_service.rb

@@ -13,6 +13,7 @@ class Projects::MigrateService < ApplicationService
     @project = Project.new(project_params)
     if @project.save!
       @project.create_project_review
+
       ProjectUnit.init_types(@project.id, project.project_type)
       Project.update_mirror_projects_count!
       @project.set_owner_permission(user)
@@ -27,6 +28,9 @@ class Projects::MigrateService < ApplicationService
   end
 
   private
+  def repo_is_public
+    params[:private].blank? ? true : !params[:private]
+  end
   def authroize_user_id_success 
     (user.id == params[:user_id].to_i) || (user.organizations.find_by_id(params[:user_id]).present?)
   end