|
@@ -59,13 +59,17 @@ func (this *MicroRoadShowController) List() {
|
|
|
if currentIndex <= 0 {
|
|
|
currentIndex = 1
|
|
|
}
|
|
|
- keyWordArr, err := services.GetIndustryMapNameSliceV3(keywords)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取分词失败,GetIndustryMapNameSliceV3 Err: " + err.Error()
|
|
|
- return
|
|
|
+ var keyWordArr []string
|
|
|
+ var err error
|
|
|
+ if keywords != "" {
|
|
|
+ keyWordArr, err = services.GetIndustryMapNameSliceV3(keywords)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取分词失败,GetIndustryMapNameSliceV3 Err: " + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ keyWordArr = services.RemoveDuplicatesAndEmpty(keyWordArr)
|
|
|
}
|
|
|
- keyWordArr = services.RemoveDuplicatesAndEmpty(keyWordArr)
|
|
|
var list []*models.MicroRoadShowPageList
|
|
|
var total int
|
|
|
var e error
|