Merge branch 'feature/v1.0.5_wky' of moapp/jypkg into feature/v1.0.5

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

@@ -29,19 +29,19 @@ type Filters struct {
 	FilterId string
 }
 
-func GetEntDataExportCount(sim mg.MongodbSim, elasticAddress, _id string, entId, entUserId int, isFirst bool, url string, maxCount int) (count, newCount int, data *[]map[string]interface{}) {
+func GetEntDataExportCount(sim, bid mg.MongodbSim, bidMgoDBName, elasticAddress, _id string, entId, entUserId int, isFirst bool, url string, maxCount int) (count, newCount int, data *[]map[string]interface{}) {
 	defer util.Catch()
 	var (
 		searchsWaitGroup = &sync.WaitGroup{}
 	)
-	count = GetDataExportSearchCountByScdId(sim, elasticAddress, _id)
+	count = GetDataExportSearchCountByScdId(sim, bid, bidMgoDBName, elasticAddress, _id)
 	if count > maxCount || count == -1 {
 		count = maxCount
 	}
 	log.Println("count", count)
 	dataType := "2"
 	//数据导出数据查询
-	res, err := GetDataExportSearchResultByScdId(sim, elasticAddress, _id, dataType, count)
+	res, err := GetDataExportSearchResultByScdId(sim, bid, bidMgoDBName, elasticAddress, _id, dataType, count)
 	if err != nil {
 		log.Println("企业数据导出错误 ", err)
 		return 0, 0, nil