Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

db/migrate/20191024090740_migrate_competition_chart_rules.rb

@@ -1,14 +1,5 @@
 class MigrateCompetitionChartRules < ActiveRecord::Migration[5.2]
   def change
     add_column :competition_module_md_contents, :competition_stage_id, :integer, default: 0
-
-    ChartRule.all.each do |rule|
-      if rule.competition
-        com_module = rule.competition.competition_modules.find_by(module_type: "chart")
-        if com_module
-          CompetitionModuleMdContent.create!(content: rule.content, competition_module_id: com_module.id, competition_stage_id: rule.competition_stage_id ? rule.competition_stage_id : 0)
-        end
-      end
-    end
   end
 end

db/migrate/20191026110116_migrate_chart_rule.rb

@@ -0,0 +1,12 @@
+class MigrateChartRule < ActiveRecord::Migration[5.2]
+  def change
+    ChartRule.all.each do |rule|
+      if rule.competition
+        com_module = rule.competition.competition_modules.find_by(module_type: "chart")
+        if com_module && !com_module.competition_module_md_contents.exists?(competition_stage_id: rule.competition_stage_id ? rule.competition_stage_id : 0)
+          CompetitionModuleMdContent.create!(content: rule.content, competition_module_id: com_module.id, competition_stage_id: rule.competition_stage_id ? rule.competition_stage_id : 0)
+        end
+      end
+    end
+  end
+end