From 8f0383c21c017939a216b143ea2213dc6de2cd63 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Tue, 16 Apr 2024 14:39:21 +0800
Subject: [PATCH] =?UTF-8?q?1ipad=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/db/db_order_goods_list.go   | 6 ++++--
 app/ipad/hdl/hdl_order_goods.go | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

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 {