diff --git a/app/db/db_order_goods_list.go b/app/db/db_order_goods_list.go index d67f09e..4115376 100644 --- a/app/db/db_order_goods_list.go +++ b/app/db/db_order_goods_list.go @@ -8,8 +8,10 @@ import ( func GetOrderGoodsListByIpad(eg *xorm.Engine, param map[string]string) (*[]model.OrderGoods, int64) { var order []model.OrderGoods - sess := eg.Where("state<4") - + sess := eg.Where("state!=5 ") + if param["sorting"] == "1" { + sess.And("state!=4") + } if param["oid"] != "" { sess.And("oid = ?", param["oid"]) } diff --git a/app/ipad/hdl/hdl_order_goods.go b/app/ipad/hdl/hdl_order_goods.go index bd36469..eff58dd 100644 --- a/app/ipad/hdl/hdl_order_goods.go +++ b/app/ipad/hdl/hdl_order_goods.go @@ -87,6 +87,7 @@ func SortingOrderGoods(c *gin.Context) { return } eg := db.Db + args["sorting"] = "1" data, _ := db.GetOrderGoodsListByIpad(eg, args) list := make([]map[string]string, 0) if data != nil {