Merge remote-tracking branch 'origin/master'

BaseDataMaintenance/maintenance/dataflow_mq.py

@@ -436,10 +436,11 @@ class Dataflow_ActivteMQ_attachment(Dataflow_attachment):
                         return False
 
                 # 重跑swf时，删除原来的swf_urls中的"\"
-                swf_urls = attach.getProperties().get(attachment_swfUrls, "[]")
-                swf_urls = swf_urls.replace('\\', '') if swf_urls else '[]'
-                swf_urls = json.loads(swf_urls)
-                attach.setValue(attachment_swfUrls, json.dumps(swf_urls, ensure_ascii=False), True)
+                if attach.getProperties().get(attachment_filetype) == "swf":
+                    swf_urls = attach.getProperties().get(attachment_swfUrls, "[]")
+                    swf_urls = swf_urls.replace('\\', '') if swf_urls else '[]'
+                    swf_urls = json.loads(swf_urls)
+                    attach.setValue(attachment_swfUrls, json.dumps(swf_urls, ensure_ascii=False), True)
 
                 swf_images = eval(swf_images)
                 if attach.getProperties().get(attachment_filetype)=="swf" and len(swf_images)>0: