Merge branch 'dev/2.2_daokuan' into debug

controller/census/invoice_payment.go

@@ -508,26 +508,36 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 		resp.Fail("排序类型不正确", c)
 		return
 	}
-	if req.SortParam == "invoice_time" || req.SortParam == "" {
-		page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: true})
-		page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: false})
+	if req.SortParam == "" {
+			page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: true})
+			page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: false})
+			page.AddOrderItem(base.OrderItem{Column: "c.invoice_time", Asc: false})
+			page.AddOrderItem(base.OrderItem{Column: "c.amount", Asc: false})
+			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
+	}else if req.SortParam == "invoice_time" {
 		if req.SortType == "asc" {
+			page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: false})
 			page.AddOrderItem(base.OrderItem{Column: "c.invoice_time", Asc: true})
+			page.AddOrderItem(base.OrderItem{Column: "c.amount", Asc: true})
+			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: true})
 		}else{
+			page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: true})
 			page.AddOrderItem(base.OrderItem{Column: "c.invoice_time", Asc: false})
+			page.AddOrderItem(base.OrderItem{Column: "c.amount", Asc: false})
+			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
 		}
-		page.AddOrderItem(base.OrderItem{Column: "c.amount", Asc: false})
-		page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
 	}else if req.SortParam == "payment_date" {
-		page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: false})
-		page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: true})
 		if req.SortType == "asc" {
+			page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: false})
 			page.AddOrderItem(base.OrderItem{Column: "d.invoice_time", Asc: true})
+			page.AddOrderItem(base.OrderItem{Column: "d.amount", Asc: true})
+			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: true})
 		}else{
+			page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: true})
 			page.AddOrderItem(base.OrderItem{Column: "d.invoice_time", Asc: false})
+			page.AddOrderItem(base.OrderItem{Column: "d.amount", Asc: false})
+			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
 		}
-		page.AddOrderItem(base.OrderItem{Column: "d.amount", Asc: false})
-		page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
 	}else{
 		resp.Fail("排序字段不正确", c)
 		return