|
@@ -1,21 +1,22 @@
|
|
package util
|
|
package util
|
|
|
|
|
|
import (
|
|
import (
|
|
- "app.yhyue.com/moapp/jybase/common"
|
|
|
|
- "app.yhyue.com/moapp/jybase/encrypt"
|
|
|
|
- elastic "app.yhyue.com/moapp/jybase/es"
|
|
|
|
- "app.yhyue.com/moapp/jybase/log"
|
|
|
|
"cmplatform/models"
|
|
"cmplatform/models"
|
|
sql "cmplatform/util/sqlmodel"
|
|
sql "cmplatform/util/sqlmodel"
|
|
"context"
|
|
"context"
|
|
"encoding/json"
|
|
"encoding/json"
|
|
"errors"
|
|
"errors"
|
|
"fmt"
|
|
"fmt"
|
|
- "go.mongodb.org/mongo-driver/bson"
|
|
|
|
- "go.uber.org/zap"
|
|
|
|
"regexp"
|
|
"regexp"
|
|
"strings"
|
|
"strings"
|
|
"time"
|
|
"time"
|
|
|
|
+
|
|
|
|
+ "app.yhyue.com/moapp/jybase/common"
|
|
|
|
+ "app.yhyue.com/moapp/jybase/encrypt"
|
|
|
|
+ elastic "app.yhyue.com/moapp/jybase/es"
|
|
|
|
+ "app.yhyue.com/moapp/jybase/log"
|
|
|
|
+ "go.mongodb.org/mongo-driver/bson"
|
|
|
|
+ "go.uber.org/zap"
|
|
)
|
|
)
|
|
|
|
|
|
const (
|
|
const (
|
|
@@ -660,8 +661,13 @@ func Utiltags(tag map[string]interface{}) string {
|
|
ffBoolObject.Must = append(ffBoolObject.Must, sql.ToptypeSubtypeMust{&toptypeSubtype})
|
|
ffBoolObject.Must = append(ffBoolObject.Must, sql.ToptypeSubtypeMust{&toptypeSubtype})
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if tab.Site != "" {
|
|
|
|
- ffBoolObject.Must = append(ffBoolObject.Must, sql.SiteMust{Site: &sql.Site{Site: strings.Split(tab.Site, ",")}})
|
|
|
|
|
|
+ if common.ObjToString(tag["s_userid"]) == "6576d2e803e7b697bf93acfb" {
|
|
|
|
+ siteArr := []string{"全军武器装备采购信息网", "军队采购网", "中国核工业集团公司电子商务平台", "航天电子采购平台", "中国电子科技集团有限公司电子采购平台", "阳光七采兵纷招采电子招标投标交易平台", "中国融通电子商务平台"}
|
|
|
|
+ ffBoolObject.Must = append(ffBoolObject.Must, sql.SiteMust{Site: &sql.Site{Site: siteArr}})
|
|
|
|
+ } else {
|
|
|
|
+ if tab.Site != "" {
|
|
|
|
+ ffBoolObject.Must = append(ffBoolObject.Must, sql.SiteMust{Site: &sql.Site{Site: strings.Split(tab.Site, ",")}})
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if tab.Istarttime > 0 && tab.Iendtime > 0 {
|
|
if tab.Istarttime > 0 && tab.Iendtime > 0 {
|
|
ffBoolObject.Must = append(ffBoolObject.Must, sql.PublishtimeMust{PublishtimeObject: &sql.PublishtimeObject{Publishtime: &sql.Publishtime{
|
|
ffBoolObject.Must = append(ffBoolObject.Must, sql.PublishtimeMust{PublishtimeObject: &sql.PublishtimeObject{Publishtime: &sql.Publishtime{
|