Merge branch 'feature/v1.0.23_ws' of moapp/jypkg into feature/v1.0.23

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

@@ -9,8 +9,9 @@ import (
 )
 
 const (
-	RedisPoly         = "poly"     // 查白名单用户用的redis
-	WhitelistRedisKey = "white_%s" // 白名单用户用的redis key
+	RedisPoly               = "poly"     // 查白名单用户用的redis
+	WhitelistRedisKey       = "white_%s" // 白名单用户用的redis key
+	ResCount          int64 = -2
 )
 
 // GetLastExportPhoneAndMail 数据导出联想上次导出手机号和邮箱查询

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

@@ -774,7 +774,7 @@ func GetDataExportSelectReallyCountFromMongo(bid mg.MongodbSim, biddingName stri
 
 	}
 	wait.Wait()
-	return qutil.If(count > 0, count, -2).(int64)
+	return qutil.If(count > 0, count, ResCount).(int64)
 }
 
 func GetDataExportSelectResultFromEs(bidding mg.MongodbSim, biddingName string, scd *SieveCondition, dataType string, checkCount int) (*[]map[string]interface{}, error) {