提交

src/jfw/front/frontRouter.go

@@ -155,7 +155,7 @@ func (this *CommonRouter) BigpcPage(htmlPage string) error {
 	return this.doPcBigPage(htmlPage)
 }
 
-var bigVipFreePageReg = regexp.MustCompile(`set_*|free_*|ent_portrait`)
+var bigVipFreePageReg = regexp.MustCompile(`set_*|free_*`)
 
 func (this *CommonRouter) doPcBigPage(pageSign string) error {
 	userid, _ := this.GetSession("userId").(string)
@@ -164,17 +164,19 @@ func (this *CommonRouter) doPcBigPage(pageSign string) error {
 		return this.Redirect("/notin/page")
 	}
 	//没有购买大会员跳转大会员介绍页
-	if array := strings.Split(pageSign, "/"); len(array) > 0 {
-		pageSign = array[0]
-	}
-	if !bigVipFreePageReg.MatchString(pageSign) {
-		bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
-		if bigBaseMsg.Status <= 0 && !bigBaseMsg.Viper {
-			return this.Redirect("/big/page/index")
+	if !strings.HasPrefix(pageSign, "svip/ent_ser_portrait") {
+		if array := strings.Split(pageSign, "/"); len(array) > 0 {
+			pageSign = array[0]
 		}
-		//大会员页面权限判断
-		if !bigBaseMsg.CheckBigVipFrontPower(pageSign) {
-			return this.Redirect("/big/page/index")
+		if !bigVipFreePageReg.MatchString(pageSign) {
+			bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
+			if bigBaseMsg.Status <= 0 && !bigBaseMsg.Viper {
+				return this.Redirect("/big/page/index")
+			}
+			//大会员页面权限判断
+			if !bigBaseMsg.CheckBigVipFrontPower(pageSign) {
+				return this.Redirect("/big/page/index")
+			}
 		}
 	}
 	return this.Render(fmt.Sprintf("/frontRouter/pc/page_big_pc/sess/index.html"))

src/jfw/modules/publicapply/src/enterpriseSearch/entity/entQuery.go

@@ -111,8 +111,6 @@ func (es *EnterpriseSearch) Check() (*EnterpriseSearch, error) {
 //判断是否是空查询
 func (es *EnterpriseSearch) isEmptySearch() bool {
 	if es.Match == "" &&
-		(es.MatchType == "" ||
-			es.MatchType == "A") &&
 		es.EntArea == "" &&
 		es.EntCity == "" &&
 		es.EntCapital == "" &&