feat:完善信息,增加socket

This commit is contained in:
henry
2022-01-27 17:12:41 +08:00
parent 4ae37b9b4d
commit 4c57ca2878
4 changed files with 82 additions and 39 deletions

View File

@ -277,9 +277,12 @@ func Last(model IModel) (bool, error) {
return true, nil
}
func LastWhere(model IModel, where ...*ModelWhere) (bool, error) {
func LastWhere(model IModel, fields []string, where ...*ModelWhere) (bool, error) {
db := orm.GetDB().Table(model.TableName())
if len(fields) > 0 {
db = db.Select(fields)
}
if len(where) > 0 {
for _, wo := range where {
db = db.Where(wo.Condition, wo.Value)
@ -290,7 +293,7 @@ func LastWhere(model IModel, where ...*ModelWhere) (bool, error) {
if db.Migrator().HasColumn(model, FieldsForDeleted) {
db = db.Where(FieldsForDeleted, DeleteStatusForNot)
}
if err := db.Order("id " + OrderModeToDesc).First(model).Error; err != nil {
if err := db.Order(FieldsForID + " " + OrderModeToDesc).First(model).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return false, nil
}