From 067650e77790adeb5222b7736649cb5b6b016162 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 28 四月 2024 10:49:44 +0800
Subject: [PATCH] 时间范围和该工人以往添加记录重复性校验
---
controllers/dict.go | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/controllers/dict.go b/controllers/dict.go
index cd22412..31f0965 100644
--- a/controllers/dict.go
+++ b/controllers/dict.go
@@ -88,19 +88,19 @@
}
func (slf DictController) ParamsCheck(params models.Dict) (err error) {
- if params.Number == "" || params.Name == "" {
+ if params.Name == "" {
return errors.New("鍙傛暟缂哄け")
}
- dict, err := models.NewDictSearch().SetNumber(params.Number).First()
- if err != gorm.ErrRecordNotFound && dict != nil && dict.ID != params.ID {
- return errors.New("缂栧彿閲嶅")
- }
-
- dict, err = models.NewDictSearch().SetName(params.Name).First()
+ dict, err := models.NewDictSearch().SetName(params.Name).First()
if err != gorm.ErrRecordNotFound && dict != nil && dict.ID != params.ID {
return errors.New("鍚嶇О閲嶅")
}
-
+ if params.Number != "" {
+ dict, err := models.NewDictSearch().SetDictType(params.DictType).SetNumber(params.Number).First()
+ if err != gorm.ErrRecordNotFound && dict != nil && dict.ID != params.ID {
+ return errors.New("缂栧彿閲嶅")
+ }
+ }
return nil
}
@@ -122,7 +122,7 @@
if params.DictType != nil {
search = search.SetDictType(params.DictType)
}
- list, err := search.FindAll()
+ list, err := search.SetKeyword(params.Keyword).FindAll()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
--
Gitblit v1.8.0