fix

controller/census/invoice_payment.go

@@ -336,7 +336,7 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 	serviceTempCond := ``
 	serviceTempPars := make([]interface{}, 0)
 	serviceTempOB := new(fms.ContractServiceTemplate)
-	serviceTempList, e := serviceTempOB.List(serviceTempCond, serviceTempPars)
+	serviceTempList, e := serviceTempOB.OrderList(serviceTempCond, serviceTempPars)
 	if e != nil {
 		resp.FailData("获取套餐模板列表失败", "Err:"+e.Error(), c)
 		return

models/fms/contract_service_template.go

@@ -35,6 +35,16 @@ func (st *ContractServiceTemplate) List(condition string, pars []interface{}) (l
 	return
 }
 
+func (st *ContractServiceTemplate) OrderList(condition string, pars []interface{}) (list []*ContractServiceTemplate, err error) {
+	list = make([]*ContractServiceTemplate, 0)
+	err = global.DEFAULT_MYSQL.Model(st).
+		Where("is_delete = 0").
+		Where(condition, pars...).
+		Order("sort ASC ").
+		Find(&list).Error
+	return
+}
+
 type ContractServiceTemplateItem struct {
 	ServiceTemplateId int    `json:"service_template_id" description:"套餐模板ID"`
 	ProductId         int    `json:"product_id" description:"产品ID"`
@@ -89,7 +99,7 @@ func GetContractServiceTemplateAllByProductId(productId int) (items []*ContractS
 	items = make([]*ContractServiceTemplateItem, 0)
 	err = global.DEFAULT_MYSQL.Table("contract_service_template").
 		Where("product_id = ? AND is_delete = 0", productId).
-		Order("service_template_id ASC").
+		Order("sort ASC").
 		Find(&items).Error
 	return
 }