williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善入驻信息管理

Browse Source
This commit is contained in:
henry
2021-12-03 14:18:06 +08:00
parent 25ac50bb51
commit 851a2c1784
44 changed files with 192 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/common/model/model.go
View File

@ -215,8 +215,6 @@ func FirstWhere(model IModel, where ...*ModelWhere) (bool, error) {
for _, wo := range where {
db = db.Where(wo.Condition, wo.Value)
}
} else {
db = db.Where(fmt.Sprintf("%s = %d", FieldsForID, model.GetID()))
}
if db.Migrator().HasColumn(model, FieldsForDeleted) {
db = db.Where(FieldsForDeleted, DeleteStatusForNot)
@ -230,20 +228,18 @@ func FirstWhere(model IModel, where ...*ModelWhere) (bool, error) {
return true, nil
}
func FirstField(model IModel, field []string, where ...*ModelWhere) (bool, error) {
db := orm.GetDB().Table(model.TableName())
func FirstField(model IModel, fields []string, where ...*ModelWhere) (bool, error) {
db := orm.GetDB().Table(model.TableName()).Select(fields)
if len(where) > 0 {
for _, wo := range where {
db = db.Where(wo.Condition, wo.Value)
}
} else {
db = db.Where(fmt.Sprintf("%s = %d", FieldsForID, model.GetID()))
}
if db.Migrator().HasColumn(model, FieldsForDeleted) {
db = db.Where(FieldsForDeleted, DeleteStatusForNot)
}
if err := db.Select(field).First(model).Error; err != nil {
if err := db.First(model).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return false, nil
}