tijiao

services/userlib/userDocService.go

@@ -452,6 +452,16 @@ func UserMerge(mergeUser, mergedUser, appId string) (bool, string) {
 					return err
 				}
 			}
+			if (mergeUserDocData.IsDownload==1){
+				value.IsDownload=mergeUserDocData.IsDownload
+				value.IsDelete=mergeUserDocData.IsDelete
+			}
+			if (mergeUserDocData.IsCollection==1){
+				value.IsCollection=mergeUserDocData.IsCollection
+
+			}
+
+
 			err = orm.Exec("UPDATE user_doc SET isCollection = ?,isDelete=? , isDownload=?  ,update_at=?,cost=? WHERE id = ?", value.IsCollection, model.UserDocCategory_SelfUpload, value.IsDownload,time.Now().Local(), value.Cost,mergeUserDocData.Id)
 			if err.Error != nil {
 				log.Println("文档合并失败")