ci: support husky

feat: fix lint issues
This commit is contained in:
yanghao05
2023-03-07 19:07:31 +08:00
parent bfe1870420
commit 8d1bd191df
5 changed files with 42 additions and 8 deletions

View File

@@ -6,7 +6,6 @@ import (
"context"
"errors"
"log"
"time"
)
type Dict struct {
@@ -37,9 +36,8 @@ func NewDictionary(query *query.Query) (*Dict, error) {
}
func (dict *Dict) Load() error {
ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
dictTable := dict.query.SysDictionary
items, err := dictTable.WithContext(ctx).Where(dictTable.Status.Is(true)).Find()
items, err := dictTable.WithContext(context.Background()).Where(dictTable.Status.Is(true)).Find()
if err != nil {
return err
}
@@ -50,9 +48,8 @@ func (dict *Dict) Load() error {
dict.mapAlias[item.Alias_] = item.ID
}
ctx, _ = context.WithTimeout(context.Background(), time.Second*5)
dictDetailTable := dict.query.SysDictionaryDetail
dictItems, err := dictDetailTable.WithContext(ctx).
dictItems, err := dictDetailTable.WithContext(context.Background()).
Where(dictDetailTable.Status.Is(true)).
Where(dictDetailTable.ID.In(ids...)).
Order(dictDetailTable.Weight.Desc()).