feet_template: upgrade

module/group.go

@@ -669,6 +669,10 @@ func FeetTemplateUpgradeNewVersion(ctx context.Context, pastureId, feedTemplateI
 		return err
 	}
 
+	defer func() {
+
+	}()
+
 	DBSession := restful.Engine.NewSession()
 	defer DBSession.Close()
 
@@ -677,16 +681,14 @@ func FeetTemplateUpgradeNewVersion(ctx context.Context, pastureId, feedTemplateI
 	}
 
 	if _, err = DBSession.Table(new(models.FeedTemplateDetail).TableName()).
-		Where("pasture_id = ?", pastureId).
-		And("feed_template_id = ?", feedTemplateId).
-		Update("is_show", operationPb.IsShow_NO); err != nil {
-		DBSession.Rollback()
+		Where("pastureid = ?", pastureId).
+		And("ftid = ?", feedTemplateId).
+		Update(map[string]interface{}{"is_show": operationPb.IsShow_NO}); err != nil {
 		return err
 	}
 
-	res, err := SearchFeedDetailVersionLogById(ctx, pastureId, feedTemplateId, newFeedDetailVersion.Id)
+	res, err := SearchFeedDetailVersionLogById(ctx, pastureId, newFeedDetailVersion.FeedTemplateId, newFeedDetailVersion.Id)
 	if err != nil {
-		DBSession.Rollback()
 		return err
 	}
 
@@ -717,7 +719,6 @@ func FeetTemplateUpgradeNewVersion(ctx context.Context, pastureId, feedTemplateI
 	}
 
 	if _, err = DBSession.Table(new(models.FeedTemplateDetail).TableName()).Insert(newFtDetailList); err != nil {
-		DBSession.Rollback()
 		return err
 	}