merge

api/internal/service/prListService.go

@@ -29,7 +29,7 @@ func GetMonitorList(req *types.PrMonitorListReq) (resultList *[]map[string]inter
 		}
 		pageStart := (req.PageNum - 1) * req.PageSize
 		esQuery1 := ""
-		scopeClass := FindBusiness(req.EntId)
+		scopeClass := FindBusiness(req.EntId, req.MgoUserId)
 		if scopeClass != "" {
 			var should []string
 			for _, v := range strings.Split(scopeClass, ",") {
@@ -47,7 +47,7 @@ func GetMonitorList(req *types.PrMonitorListReq) (resultList *[]map[string]inter
 }
 
 func GetCollectList(req *types.PrCollectListReq) (resultList []map[string]interface{}, total int64) {
-	scopeClass := FindBusiness(req.EntId)
+	scopeClass := FindBusiness(req.EntId, req.MgoUserId)
 	info := T.JianyuMysql.Find("bdcollection", map[string]interface{}{"userid": req.UserId}, "", `{id: 1}`, -1, -1)
 	var ids []interface{}
 	for _, m := range *info {