Merge remote-tracking branch 'origin/master'

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

@@ -530,7 +530,7 @@ func GetDataExportSearchCountBySieveCondition(scd *SieveCondition, elasticAddres
 			}
 			if searchTextSize > 0 {
 				if secondKWS := jy.HttpEs(scd.Keyword[0].Keyword, "ik_smart", elasticAddress); secondKWS != "" {
-					scd.Keyword[0].Keyword = jy.KeywordsProcessing(secondKWS, " ")
+					scd.Keyword[0].Keyword = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), " ")
 				}
 			}
 			// 附加词分词
@@ -541,7 +541,7 @@ func GetDataExportSearchCountBySieveCondition(scd *SieveCondition, elasticAddres
 				}
 				if appendTextSize > 0 {
 					if secondKWS := jy.HttpEs(scd.Keyword[0].Appended[i], "ik_smart", elasticAddress); secondKWS != "" {
-						scd.Keyword[0].Appended[i] = jy.KeywordsProcessing(secondKWS, " ")
+						scd.Keyword[0].Appended[i] = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), " ")
 					}
 				}
 			}
@@ -768,7 +768,7 @@ func GetDataExportIds(elasticAddress string, scd *SieveCondition, checkCount int
 			}
 			if searchTextSize > 0 {
 				if secondKWS := jy.HttpEs(scd.Keyword[0].Keyword, "ik_smart", elasticAddress); secondKWS != "" {
-					scd.Keyword[0].Keyword = jy.KeywordsProcessing(secondKWS, " ")
+					scd.Keyword[0].Keyword = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), " ")
 				}
 			}
 			// 附加词分词
@@ -779,7 +779,7 @@ func GetDataExportIds(elasticAddress string, scd *SieveCondition, checkCount int
 				}
 				if appendTextSize > 0 {
 					if secondKWS := jy.HttpEs(scd.Keyword[0].Appended[i], "ik_smart", elasticAddress); secondKWS != "" {
-						scd.Keyword[0].Appended[i] = jy.KeywordsProcessing(secondKWS, " ")
+						scd.Keyword[0].Appended[i] = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), " ")
 					}
 				}
 			}
@@ -838,7 +838,7 @@ func GetDataExportSearchResult(bid mg.MongodbSim, bidMgoDBName, elasticAddress s
 			}
 			if searchTextSize > 0 {
 				if secondKWS := jy.HttpEs(scd.Keyword[0].Keyword, "ik_smart", elasticAddress); secondKWS != "" {
-					scd.Keyword[0].Keyword = jy.KeywordsProcessing(secondKWS, " ")
+					scd.Keyword[0].Keyword = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), " ")
 				}
 			}
 			// 附加词分词
@@ -849,7 +849,7 @@ func GetDataExportSearchResult(bid mg.MongodbSim, bidMgoDBName, elasticAddress s
 				}
 				if appendTextSize > 0 {
 					if secondKWS := jy.HttpEs(scd.Keyword[0].Appended[i], "ik_smart", elasticAddress); secondKWS != "" {
-						scd.Keyword[0].Appended[i] = jy.KeywordsProcessing(secondKWS, " ")
+						scd.Keyword[0].Appended[i] = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), " ")
 					}
 				}
 			}