mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-19 17:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix database selection or db transaction usage bug

Browse Source
This commit is contained in:
MaysWind
2021-01-18 01:23:54 +08:00
parent 51b0ae8076
commit bdc7188f8b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/accounts.go
+1 -1
View File
@@ -274,7 +274,7 @@ func (s *AccountService) DeleteAccount(uid int64, accountId int64) error {
return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error { return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error {
var accountAndSubAccounts []*models.Account var accountAndSubAccounts []*models.Account
err := s.UserDataDB(uid).Where("uid=? AND deleted=? AND (account_id=? OR parent_account_id=?)", uid, false, accountId, accountId).Find(&accountAndSubAccounts) err := sess.Where("uid=? AND deleted=? AND (account_id=? OR parent_account_id=?)", uid, false, accountId, accountId).Find(&accountAndSubAccounts)
if err != nil { if err != nil {
return err return err
pkg/services/transaction_categories.go
+1 -1
View File
@@ -282,7 +282,7 @@ func (s *TransactionCategoryService) DeleteCategory(uid int64, categoryId int64)
return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error { return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error {
var categoryAndSubCategories []*models.TransactionCategory var categoryAndSubCategories []*models.TransactionCategory
err := s.UserDataDB(uid).Where("uid=? AND deleted=? AND (category_id=? OR parent_category_id=?)", uid, false, categoryId, categoryId).Find(&categoryAndSubCategories) err := sess.Where("uid=? AND deleted=? AND (category_id=? OR parent_category_id=?)", uid, false, categoryId, categoryId).Find(&categoryAndSubCategories)
if err != nil { if err != nil {
return err return err
pkg/services/transaction_tags.go
+1 -1
View File
@@ -290,7 +290,7 @@ func (s *TransactionTagService) ExistsTagName(uid int64, name string) (bool, err
return false, errs.ErrTransactionTagNameIsEmpty return false, errs.ErrTransactionTagNameIsEmpty
} }
return s.UserDB().Cols("name").Where("uid=? AND deleted=? AND name=?", uid, false, name).Exist(&models.TransactionTag{}) return s.UserDataDB(uid).Cols("name").Where("uid=? AND deleted=? AND name=?", uid, false, name).Exist(&models.TransactionTag{})
} }
// GetTagMapByList returns a transaction tag map by a list // GetTagMapByList returns a transaction tag map by a list
pkg/services/transactions.go
+1 -1
View File
@@ -464,7 +464,7 @@ func (s *TransactionService) ModifyTransaction(transaction *models.Transaction,
} }
} }
err := s.UserDB().DoTransaction(func(sess *xorm.Session) error { err := s.UserDataDB(transaction.Uid).DoTransaction(func(sess *xorm.Session) error {
// Get and verify current transaction // Get and verify current transaction
oldTransaction := &models.Transaction{} oldTransaction := &models.Transaction{}
has, err := sess.ID(transaction.TransactionId).Where("uid=? AND deleted=?", transaction.Uid, false).Get(oldTransaction) has, err := sess.ID(transaction.TransactionId).Where("uid=? AND deleted=?", transaction.Uid, false).Get(oldTransaction)