fix

liujiandao

2024-04-29 07775fd7b3bf7906324cc559e8bc96b911981ad1

fix

 service/purchase/purchase.go

@@ -144,28 +144,25 @@
            Where("srm_purchase.name like ? or srm_purchase.source_order like ? or srm_purchase.number like ?", kw, kw, kw).
            Or("srm_supplier_material.name like ?", kw).
            Or("srm_supplier.name like ?", kw)
        err = db.Count(&total).Error
        if err != nil {
            return purchaseList, total, err
        }
        err = db.Limit(limit).Offset(offset).Find(&ids).Error
        err = db.Find(&ids).Error
        if err != nil {
            return purchaseList, total, err
        }
    } else if info.SupplierId != 0 {
        db = db.Where("supplier_id = ?", info.SupplierId)
    }
    if total == 0 {
    if len(ids) != 0 {
        db = global.GVA_DB.Model(&purchase.Purchase{}).Where("id in (?)", ids)
        err = db.Count(&total).Error
        if err != nil || total == 0 {
        if err != nil {
            return purchaseList, total, err
        }
    }
    if len(ids) != 0 {
        db = global.GVA_DB.Model(&purchase.Purchase{})
        err = db.Where("id in (?)", ids).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
        err = db.Preload("Supplier").Order("updated_at desc").Limit(limit).Offset(offset).Find(&purchaseList).Error
    } else {
        //db = global.GVA_DB.Model(&purchase.Purchase{})
        err = db.Count(&total).Error
        if err != nil {
            return purchaseList, total, err
        }
        err = db.Limit(limit).Offset(offset).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
    }