Merge branch 'dev/v4.8.51.1_dx' of qmx/jy into hotfix/v4.8.51.1

src/jfw/config/config.go

@@ -106,7 +106,7 @@ func GetLetterMap(names string) []map[string]interface{} {
 		nameArr1 = append(nameArr1, fmt.Sprintf(`"%s"`, v))
 	}
 	dataArr1 := public.BaseMysql.SelectBySql(fmt.Sprintf(`select a.id,a.name,b.id class_id,b.name class_1 from seo_words.seo_industry a inner join  seo_words.seo_industry_class b on a.state=1 and  a.class_1 in (%s) and a.class_1=b.name and  a.class_2 !='药品'  order by a.class_1`, strings.Join(nameArr1, ",")))
-	dataArr2 := public.BaseMysql.SelectBySql(fmt.Sprintf(`select id,name,letter from seo_words.seo_resource where name in (%s) and state=2 order by id desc`, strings.Join(nameArr1, ",")))
+	dataArr2 := public.BaseMysql.SelectBySql(fmt.Sprintf(`select id,name,letter from seo_words.seo_resource where name in (%s) and state1=2 order by id desc`, strings.Join(nameArr1, ",")))
 	for _, v1 := range nameArr {
 		var isNormal bool
 		if dataArr1 != nil && len(*dataArr1) > 0 {
@@ -144,8 +144,8 @@ func GetLetterMap(names string) []map[string]interface{} {
 		}
 	}
 	if len(nameArr2) > 0 {
-		public.BaseMysql.SelectBySql(fmt.Sprintf(`INSERT INTO seo_words.seo_resource (name, letter, state) VALUES %s`, strings.Join(nameArr4, ",")))
-		dataArr3 := public.BaseMysql.SelectBySql(fmt.Sprintf(`select id,name,letter from seo_words.seo_resource where name in (%s) and state=2 order by id desc`, strings.Join(nameArr3, ",")))
+		public.BaseMysql.SelectBySql(fmt.Sprintf(`INSERT INTO seo_words.seo_resource (name, letter, state1) VALUES %s`, strings.Join(nameArr4, ",")))
+		dataArr3 := public.BaseMysql.SelectBySql(fmt.Sprintf(`select id,name,letter from seo_words.seo_resource where name in (%s) and state1=2 order by id desc`, strings.Join(nameArr3, ",")))
 		if dataArr3 != nil {
 			for _, v3 := range *dataArr3 {
 				letter := util.ObjToString(v3["letter"])

src/jfw/front/pcIndex.go

@@ -831,7 +831,7 @@ func getLetterMap(nameArr []string) []*hotKeyWord {
 		nameArr1 = append(nameArr1, fmt.Sprintf(`"%s"`, v))
 	}
 	dataArr1 := public.BaseMysql.SelectBySql(fmt.Sprintf(`select a.id,a.name,b.id class_id,b.name class_1 from seo_words.seo_industry a inner join  seo_words.seo_industry_class b on  a.class_1 in (%s) and a.class_1=b.name and  a.class_2 !='药品'  order by a.class_1`, strings.Join(nameArr1, ",")))
-	dataArr2 := public.BaseMysql.SelectBySql(fmt.Sprintf(`select id,name,letter from seo_words.seo_resource where name in (%s) and state=2 order by id desc`, strings.Join(nameArr1, ",")))
+	dataArr2 := public.BaseMysql.SelectBySql(fmt.Sprintf(`select id,name,letter from seo_words.seo_resource where name in (%s) and state1=2 order by id desc`, strings.Join(nameArr1, ",")))
 	for _, v1 := range nameArr {
 		var isNormal bool
 		if dataArr1 != nil && len(*dataArr1) > 0 {
@@ -869,8 +869,8 @@ func getLetterMap(nameArr []string) []*hotKeyWord {
 		}
 	}
 	if len(nameArr2) > 0 {
-		public.BaseMysql.SelectBySql(fmt.Sprintf(`INSERT INTO seo_words.seo_resource (name, letter, state) VALUES %s`, strings.Join(nameArr4, ",")))
-		dataArr3 := public.BaseMysql.SelectBySql(fmt.Sprintf(`select id,name,letter from seo_words.seo_resource where name in (%s) and state=2 order by id desc`, strings.Join(nameArr3, ",")))
+		public.BaseMysql.SelectBySql(fmt.Sprintf(`INSERT INTO seo_words.seo_resource (name, letter, state1) VALUES %s`, strings.Join(nameArr4, ",")))
+		dataArr3 := public.BaseMysql.SelectBySql(fmt.Sprintf(`select id,name,letter from seo_words.seo_resource where name in (%s) and state1=2 order by id desc`, strings.Join(nameArr3, ",")))
 		if dataArr3 != nil {
 			for _, v3 := range *dataArr3 {
 				letter := util.ObjToString(v3["letter"])

src/jfw/front/tags.go

@@ -556,8 +556,8 @@ func (this *Tags) GetConsult() (list []map[string]interface{}) {
 
 func (this *Tags) GetLetterMap(pageSize, pageNum int64, letter string) ([]map[string]interface{}, int64) {
 	m := []map[string]interface{}{}
-	sql := `select id,name,letter from seo_words.seo_resource where letter = ? and state=2 order by id desc`
-	cql := `select count(1) from seo_words.seo_resource where letter = ? and state=2 `
+	sql := `select id,name,letter from seo_words.seo_resource where letter = ? and state1=2 order by id desc`
+	cql := `select count(1) from seo_words.seo_resource where letter = ? and state1=2 `
 	offset := (pageNum - 1) * pageSize
 	sql += fmt.Sprintf(" limit %v,%v", offset, pageSize)
 	data := public.BaseMysql.SelectBySql(sql, letter)
@@ -583,8 +583,8 @@ func (this *Tags) GetHotLabel(length int64) []map[string]interface{} {
 		return qu.ObjArrToMapArr(l)
 	} else {
 		m := []map[string]interface{}{}
-		sql := `select id,name,letter from seo_words.seo_resource where state=2`
-		cql := `select count(1) from seo_words.seo_resource where state=2`
+		sql := `select id,name,letter from seo_words.seo_resource where state1=2`
+		cql := `select count(1) from seo_words.seo_resource where state1=2`
 		count := public.BaseMysql.CountBySql(cql)
 		rand.Seed(time.Now().UnixNano())
 		offset := rand.Intn(int(count / length))