zhou.xiaoning 3 gadi atpakaļ
vecāks
revīzija
68c254a21c
3 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 2 2
      models/ermcp.go
  2. 1 1
      models/ermcp3.go
  3. 1 1
      models/ermcp8.go

+ 2 - 2
models/ermcp.go

@@ -317,11 +317,11 @@ func (r *ErmcpModel) buildSql(nContractType, nQueryType int32) string {
 
 	var orderBy string
 	var status string
-	if 1 == nQueryType {
+	if nQueryType == 1 {
 		// 全部
 		status = "2,3"
 		orderBy = " order by t.audittime desc"
-	} else if 2 == nQueryType {
+	} else if nQueryType == 2 {
 		// 待点价
 		status = "2"
 		str = str + " and t.qty - t.pricedqty > 0 and t.pricetype !=1 "

+ 1 - 1
models/ermcp3.go

@@ -238,7 +238,7 @@ func (r *ErmcpDeliveryGoodsDetail) GetData() ([]ErmcpDeliveryGoodsDetail, error)
 	if err != nil {
 		return sData, err
 	}
-	if data == nil || len(data) == 0 {
+	if len(data) == 0 {
 		return sData, nil
 	}
 	// 基本信息

+ 1 - 1
models/ermcp8.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // Ermcp2himiddlegoodsOrc 项目套保品种明细