Merge branch 'master' of https://jygit.jydev.jianyu360.cn/moapp/jypkg into master

common/src/qfw/util/dataexport/dataexport.go

@@ -2,12 +2,9 @@ package dataexport
 
 import (
 	//"config"
-	. "app.yhyue.com/moapp/jybase/date"
-	. "app.yhyue.com/moapp/jybase/encrypt"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/gogf/gf/v2/util/gconv"
 	"log"
 	"math"
 	"regexp"
@@ -17,6 +14,11 @@ import (
 	"sync"
 	"time"
 
+	. "app.yhyue.com/moapp/jybase/date"
+	. "app.yhyue.com/moapp/jybase/encrypt"
+
+	"github.com/gogf/gf/v2/util/gconv"
+
 	qutil "app.yhyue.com/moapp/jybase/common"
 	elastic "app.yhyue.com/moapp/jybase/es"
 	mg "app.yhyue.com/moapp/jybase/mongodb"
@@ -783,7 +785,7 @@ func GetDataExportSelectResultFromEs(bidding mg.MongodbSim, biddingName string,
 			idArr = []string{}
 		}
 	}
-	if len(returnLsit) == checkCount || checkCount == -1 {
+	if len(returnLsit) == checkCount || checkCount == -1 || checkCount == -2 {
 		return &returnLsit, nil
 	} else {
 		return nil, fmt.Errorf("GetDataExportSelectResultFromEs 选择数据导出异常 数据量期望%d条，实际查询%d条", checkCount, len(returnLsit))
@@ -849,7 +851,7 @@ func GetDataExportSelectResultFromMongoDb(bidding mg.MongodbSim, biddingName str
 			idArr = []string{}
 		}
 	}
-	if len(returnLsit) == checkCount || checkCount == -1 {
+	if len(returnLsit) == checkCount || checkCount == -1 || checkCount == -2 {
 		return &returnLsit, nil
 	} else {
 		return nil, fmt.Errorf("GetDataExportSelectResultFromMongoDb 选择数据导出异常 数据量期望%d条，实际查询%d条", checkCount, len(returnLsit))