diff --git a/kernel/api/storage.go b/kernel/api/storage.go index e20530216..e8ea3e6ca 100644 --- a/kernel/api/storage.go +++ b/kernel/api/storage.go @@ -122,12 +122,7 @@ func getCriteria(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) - data, err := model.GetCriteria() - if nil != err { - ret.Code = -1 - ret.Msg = err.Error() - return - } + data := model.GetCriteria() ret.Data = data } diff --git a/kernel/model/storage.go b/kernel/model/storage.go index 813bb72dc..059a48bf4 100644 --- a/kernel/model/storage.go +++ b/kernel/model/storage.go @@ -233,10 +233,11 @@ func SetCriterion(criterion *Criterion) (err error) { return } -func GetCriteria() (ret []*Criterion, err error) { +func GetCriteria() (ret []*Criterion) { criteriaLock.Lock() defer criteriaLock.Unlock() - return getCriteria() + ret, _ = getCriteria() + return } func setCriteria(criteria []*Criterion) (err error) {