Просмотр исходного кода

修改敞口/期货明细无数据时的返回值类型为数组

zou.yingbin 4 лет назад
Родитель
Сommit
80fcd4d7ab
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      models/ermcpExposure.go

+ 3 - 3
models/ermcpExposure.go

@@ -688,22 +688,22 @@ func (r *ErmcpExposurePostion) ParseFromHedgePos(val *ErmcpTradeGoods, data *Erm
 
 // 获取敞口明细期货头寸
 func (r *ErmcpExposurePostion) GetDataEx() (interface{}, error) {
+	sData := make([]ErmcpExposurePostion, 0)
 	// 查询交易商品
 	mg := ErmcpTradeGoods{AREAUSERID: r.AREAUSERID, MIDDLEGOODSID: r.MIDDLEGOODSID}
 	sGoods, err := mg.GetData()
 	if err != nil || sGoods == nil || len(sGoods) == 0 {
-		return nil, err
+		return sData, err
 	}
 
 	// 查询头寸(母账号)
 	mp := ErmcpHedgePosition{RELATEDUSERID: r.AREAUSERID}
 	sPostion, err1 := mp.GetData()
 	if err1 != nil || sPostion == nil || len(sPostion) == 0 {
-		return nil, err1
+		return sData, err1
 	}
 
 	// 合并处理
-	sData := make([]ErmcpExposurePostion, 0)
 	for i := range sPostion {
 		if val, ok := sGoods[sPostion[i].HEDGEGOODSID]; ok {
 			d := ErmcpExposurePostion{}