浏览代码

Merge branch 'feature/v1.1.54_ws' of BaseService/jyMicroservices into feature/v1.1.54

wangshan 1 年之前
父节点
当前提交
d2181eb50d
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      jyBXCore/api/internal/logic/searchListLogic.go

+ 7 - 2
jyBXCore/api/internal/logic/searchListLogic.go

@@ -10,6 +10,7 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"log"
 	"net/http"
+	"regexp"
 	"strings"
 	"time"
 
@@ -38,7 +39,10 @@ func (l *SearchListLogic) SearchList(req *types.SearchReq) (resp *types.CommonRe
 	defer common.Catch()
 	t := time.Now()
 	limitFlag, isNew := util.GetFlag(l.r, l.w, req.UserId)
-	var mobileTag []string
+	var (
+		mobileTag []string
+		MobileReg = regexp.MustCompile("(?i)(Android|Mobile|Phone)")
+	)
 	//工作台内
 	if strings.Contains(l.r.Referer(), "/page_workDesktop/work-bench") {
 		mobileTag = req.MobileTag
@@ -101,7 +105,8 @@ func (l *SearchListLogic) SearchList(req *types.SearchReq) (resp *types.CommonRe
 			Data:     nil,
 		}, err
 	}
-	if req.UserId == "" {
+	//移动端未登录
+	if req.UserId == "" && MobileReg.MatchString(l.r.UserAgent()) {
 		var data []map[string]interface{}
 		detailMosaicTxt := IC.C.DetailMosaicTxt
 		sm := common.StructToMapMore(IC.C.SearchMosaic)