tijiao

services/userlib/userDocService.go

@@ -451,7 +451,6 @@ func UserMerge(mergeUser, mergedUser, appId string) (bool, string) {
 					tx.Rollback()
 					return err
 				}
-				return nil
 			}
 			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 {