feat:删除无用变量

services/userlib/userDocService.go

@@ -1,14 +1,15 @@
 package userlib
 
 import (
-	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlib"
-	"app.yhyue.com/moapp/jy_docs/services/model"
-	docRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
 	"errors"
 	"fmt"
-	"gorm.io/gorm"
 	"log"
 	"time"
+
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlib"
+	"app.yhyue.com/moapp/jy_docs/services/model"
+	docRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
+	"gorm.io/gorm"
 )
 
 //文档收藏
@@ -403,7 +404,6 @@ func UserMerge(mergeUser, mergedUser, appId string) (bool, string) {
 	log.Println("UserMerge exec ......")
 	orm := docRpcUtil.GetJyDocsDB()
 	docData := []model.UserDoc{}
-	msg := ""
 	//先查询被合并账号所有信息
 	err := orm.Transaction(func(tx *gorm.DB) error {
 		err0 := orm.Select("*").
@@ -419,10 +419,9 @@ func UserMerge(mergeUser, mergedUser, appId string) (bool, string) {
 			err := orm.Table("user_doc").Where(" userId=? and docId=? and  appId=? ", mergeUser, value.DocId, appId).Find(&mergeUserDocData)
 			if err.Error != nil {
 				log.Printf("查询,userId:[%s],docId:[%s] 失败", mergeUser, value.DocId)
-				msg = "查询用户信息失败"
 				return err.Error
 			}
-			if  mergeUserDocData.UserId == "" {
+			if mergeUserDocData.UserId == "" {
 				userDoc := model.UserDoc{}
 				userDoc.DocSourceUserId = value.DocSourceUserId
 				userDoc.DocCategory = 2
@@ -452,17 +451,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.IsDownload == 1 {
+				value.IsDownload = mergeUserDocData.IsDownload
+				value.IsDelete = mergeUserDocData.IsDelete
 			}
-			if (mergeUserDocData.IsCollection==1){
-				value.IsCollection=mergeUserDocData.IsCollection
+			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)
+			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("文档合并失败")
 				tx.Rollback()