wangshan 5 жил өмнө
parent
commit
e6994742e3

+ 2 - 1
src/jfw/front/ws_dataExport.go

@@ -11,6 +11,7 @@ import (
 	"log"
 	"net/url"
 	"qfw/util"
+	"qfw/util/jy"
 	"qfw/util/redis"
 	"strconv"
 	"strings"
@@ -314,7 +315,7 @@ func (w *WsDataExport) SearchExport() error {
 		if selectType == "all" {
 			isIntercept = true
 		}
-		_, _, keywords = public.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
+		_, _, keywords = jy.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
 		KeyWordSave = append(KeyWordSave, public.KeyWord{Keyword: keywords})
 	}
 	//时间

+ 2 - 1
src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -8,6 +8,7 @@ import (
 	"jfw/public"
 	"log"
 	"qfw/util"
+	"qfw/util/jy"
 	"qfw/util/redis"
 	"regexp"
 	"strconv"
@@ -321,7 +322,7 @@ func (w *WsDataExport) SearchExport() error {
 		if selectType == "all" {
 			isIntercept = true
 		}
-		_, _, keywords = public.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
+		_, _, keywords = jy.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
 		KeyWordSave = append(KeyWordSave, public.KeyWord{Keyword: keywords})
 	}
 	//时间