Merge branch 'master' of http://192.168.2.103:3000/luojiehua/BaseDataMaintenance

BaseDataMaintenance/maintenance/dataflow.py

@@ -5509,7 +5509,7 @@ if __name__ == '__main__':
     # test_attachment_interface()
     df_dump = Dataflow_dumplicate(start_delete_listener=False)
     # df_dump.start_flow_dumplicate()
-    df_dump.test_dumplicate(626076001
+    df_dump.test_dumplicate(638830991
                             )
     # df_dump.dumplicate_comsumer_handle_interface(603504420,document_table="document_0000",document_table_index="document_0000_index",project_table="project_0000",project_table_index="project_0000_index_formerge")
     # compare_dumplicate_check()

BaseDataMaintenance/maxcompute/documentMerge.py

@@ -3146,7 +3146,8 @@ def to_project_json(projects):
             for _uuid in list_uuid:
                 if _uuid not in used_uuid:
                     used_uuid.add(_uuid)
-                    _proj["keep_uuid"] = list_uuid[0]
+                    _proj["keep_uuid"] = _uuid
+                    break
 
             _proj["delete_uuid"] = ",".join(list_uuid[1:])
             list_update_uuid.extend(list_uuid[1:])