From ff8e611ca657ef96f5d6cd96acec06b81a91a299 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 19 Oct 2019 14:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E9=87=8D=E5=A4=8D=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/initialization_data_controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/initialization_data_controller.rb b/app/controllers/initialization_data_controller.rb
index 3c47178db..1ab369ff5 100644
--- a/app/controllers/initialization_data_controller.rb
+++ b/app/controllers/initialization_data_controller.rb
@@ -406,11 +406,12 @@ class InitializationDataController < ApplicationController
     attachment_attrs = %i[id container_id container_type filename disk_filename filesize content_type digest downloads author_id
     created_on description disk_directory attachtype is_public copy_from quotes is_publish publish_time resource_bank_id unified_setting
     cloud_url course_second_category_id]
+    att_ids = Attachment.pluck(:id)
     Attachment.bulk_insert(*attachment_attrs) do |worker|
-      @attachments.each do |att|
+      @attachments.select{|a| !att_ids.include?(a.id) }.each do |att|
+        logger.info("###attachment_id: #{att.id}")
         base_attr = att.attributes.dup.except("author_id", "disk_directory", "copy_from")
         # 本地版将过关任务的图片迁移到files/localshixuns 目录下， copy_from记录的是他原来的目录结构
-        logger.info("########att.disk_directory: #{att.disk_directory}")
         worker.add(base_attr.merge(author_id: 1, disk_directory: "localshixuns", copy_from: "#{att.disk_directory}"))
       end
     end