Merge pull request #12 from go-cinch/piupuer/dev

[fix]bug
go-cinch · Oct 10, 2024 · 16b824d · 16b824d
2 parents a95b59f + 27b8c05
commit 16b824d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/internal/data/action.go b/internal/data/action.go
@@ -156,6 +156,7 @@ func (ro actionRepo) CodeExists(ctx context.Context, code string) (err error) {
 		if m.ID == constant.UI0 {
 			err = biz.ErrRecordNotFound(ctx)
 			log.
+				WithContext(ctx).
 				WithError(err).
 				Error("invalid code: %s", code)
 			return
@@ -171,7 +172,9 @@ func (ro actionRepo) WordExists(ctx context.Context, word string) (ok bool) {
 	for _, item := range arr {
 		m := db.GetByCol("word", item)
 		if m.ID == constant.UI0 {
-			log.Error("invalid word: %s", item)
+			log.
+				WithContext(ctx).
+				Error("invalid word: %s", item)
 			return
 		}
 	}

diff --git a/internal/data/role.go b/internal/data/role.go
@@ -129,7 +129,9 @@ func (ro roleRepo) WordExists(ctx context.Context, word string) (ok bool) {
 	for _, item := range arr {
 		m := db.GetByCol("word", item)
 		if m.ID == constant.UI0 {
-			log.Error("invalid word: %s", item)
+			log.
+				WithContext(ctx).
+				Error("invalid word: %s", item)
 			return
 		}
 	}

diff --git a/internal/data/user.go b/internal/data/user.go
@@ -42,6 +42,7 @@ func (ro userRepo) GetByUsername(ctx context.Context, username string) (item *bi
 	if err != nil || m.ID == constant.UI0 {
 		err = biz.ErrRecordNotFound(ctx)
 		log.
+			WithContext(ctx).
 			WithError(err).
 			Error("invalid username: %s", username)
 		return
@@ -197,6 +198,7 @@ func (ro userRepo) Update(ctx context.Context, item *biz.UpdateUser) (err error)
 			if mRole.ID == constant.UI0 {
 				err = biz.ErrRecordNotFound(ctx)
 				log.
+					WithContext(ctx).
 					WithError(err).
 					Error("invalid roleId: %s", v)
 				return
@@ -311,6 +313,7 @@ func (ro userRepo) GetByCode(ctx context.Context, code string) (item *biz.User,
 	if err != nil || m.ID == constant.UI0 {
 		err = biz.ErrRecordNotFound(ctx)
 		log.
+			WithContext(ctx).
 			WithError(err).
 			Error("invalid code: %s", code)
 		return

diff --git a/internal/data/user_group.go b/internal/data/user_group.go
@@ -186,7 +186,9 @@ func (ro userGroupRepo) WordExists(ctx context.Context, word string) (ok bool) {
 	for _, item := range arr {
 		m := db.GetByCol("word", item)
 		if m.ID == constant.UI0 {
-			log.Error("invalid word: %s", item)
+			log.
+				WithContext(ctx).
+				Error("invalid word: %s", item)
 			return
 		}
 	}