wangshan 4 maanden geleden
bovenliggende
commit
81ffb394e7
1 gewijzigde bestanden met toevoegingen van 6 en 6 verwijderingen
  1. 6 6
      common/src/qfw/util/dataexport/dataexport.go

+ 6 - 6
common/src/qfw/util/dataexport/dataexport.go

@@ -595,7 +595,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(strings.ReplaceAll(secondKWS, "+", " "), " ")
+					scd.Keyword[0].Keyword = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), scd.Keyword[0].Keyword, " ")
 				}
 			}
 			// 附加词分词
@@ -606,7 +606,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(strings.ReplaceAll(secondKWS, "+", " "), " ")
+						scd.Keyword[0].Appended[i] = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), scd.Keyword[0].Appended[i], " ")
 					}
 				}
 			}
@@ -902,7 +902,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(strings.ReplaceAll(secondKWS, "+", " "), " ")
+					scd.Keyword[0].Keyword = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), scd.Keyword[0].Keyword, " ")
 				}
 			}
 			// 附加词分词
@@ -913,7 +913,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(strings.ReplaceAll(secondKWS, "+", " "), " ")
+						scd.Keyword[0].Appended[i] = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), scd.Keyword[0].Appended[i], " ")
 					}
 				}
 			}
@@ -975,7 +975,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(strings.ReplaceAll(secondKWS, "+", " "), " ")
+					scd.Keyword[0].Keyword = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), scd.Keyword[0].Keyword, " ")
 				}
 			}
 			// 附加词分词
@@ -986,7 +986,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(strings.ReplaceAll(secondKWS, "+", " "), " ")
+						scd.Keyword[0].Appended[i] = jy.KeywordsProcessing(strings.ReplaceAll(secondKWS, "+", " "), scd.Keyword[0].Appended[i], " ")
 					}
 				}
 			}