no message

controllers/activity.go

@@ -258,7 +258,7 @@ func (this *ActivityController) ActivityListNew() {
 	if isResearch {
 		chartPermissionIds = strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN)
 	} else {
-		//conditioninit += ` AND ( art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'  OR  ( art.is_show_hz = 1 AND art.chart_permission_id  =  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `')  )`
+		conditioninit += ` AND ( art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'  OR  ( art.is_show_hz = 1 AND art.chart_permission_id  =  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `')  )`
 	}
 
 	//行业名称

controllers/home.go

@@ -227,6 +227,7 @@ func (this *MobileHomeController) List() {
 					Abstract:    v.Abstract,
 					ImgUrlPc:    v.ImgUrlPc,
 					PublishDate: v.PublishDate,
+					IsResearch:  v.IsResearch,
 				})
 			}
 		}
@@ -285,11 +286,11 @@ func (this *MobileHomeController) NewList() {
 	resp := new(models.HomeResourceDataListNewResp)
 
 	var articleTypes, activityTypes, industries, subjectNames string
-	articleTypeCondSlice := make([]string,0)
-	activityTypesCondSlice := make([]string,0)
-	industriesCondSlice := make([]string,0)
-	subjectNamesSlice := make([]string,0)
-	articleTypeSlice := make([]string,0)
+	articleTypeCondSlice := make([]string, 0)
+	activityTypesCondSlice := make([]string, 0)
+	industriesCondSlice := make([]string, 0)
+	subjectNamesSlice := make([]string, 0)
+	articleTypeSlice := make([]string, 0)
 	if tagIds != "" {
 		tags := strings.Split(tagIds, ",")
 		for _, tagIdStr := range tags {
@@ -340,48 +341,48 @@ func (this *MobileHomeController) NewList() {
 				var articleTypeStr string
 				if articleType != "" {
 					articleTypeSlice := strings.Split(articleType, ",")
-					newArticleTypeSlice := make([]string,0)
+					newArticleTypeSlice := make([]string, 0)
 					for _, s := range articleTypeSlice {
-						newArticleTypeSlice = append(newArticleTypeSlice, "'"+ s + "'")
+						newArticleTypeSlice = append(newArticleTypeSlice, "'"+s+"'")
 					}
 					articleTypeStr = strings.Join(newArticleTypeSlice, ",")
-					articleTypeStr = strings.TrimRight(articleTypeStr,",")
-					articleTypeCond += ` AND (art.sub_category_name In (`+ articleTypeStr +`) OR (art.article_type_name In (`+ articleTypeStr +`) AND art.article_type_name <> '路演精华' AND art.article_type_id <> 0 ) ) `
+					articleTypeStr = strings.TrimRight(articleTypeStr, ",")
+					articleTypeCond += ` AND (art.sub_category_name In (` + articleTypeStr + `) OR (art.article_type_name In (` + articleTypeStr + `) AND art.article_type_name <> '路演精华' AND art.article_type_id <> 0 ) ) `
 				}
 				activityTypesCond := ``
 				if activityType != "" {
 					activityTypeSlice := strings.Split(activityType, ",")
-					newActivityTypeSlice := make([]string,0)
+					newActivityTypeSlice := make([]string, 0)
 					for _, s := range activityTypeSlice {
-						newActivityTypeSlice = append(newActivityTypeSlice, "'"+ s + "'")
+						newActivityTypeSlice = append(newActivityTypeSlice, "'"+s+"'")
 					}
 					activityTypeStr := strings.Join(newActivityTypeSlice, ",")
-					activityTypeStr = strings.TrimRight(activityTypeStr,",")
-					activityTypesCond += ` AND act.activity_type_name In (`+ activityTypeStr +`) `
+					activityTypeStr = strings.TrimRight(activityTypeStr, ",")
+					activityTypesCond += ` AND act.activity_type_name In (` + activityTypeStr + `) `
 				}
 				industriesCond := ``
 				var industryStr string
 				if industry != "" {
 					industrieSlice := strings.Split(industry, ",")
-					newIndustrieSlice := make([]string,0)
+					newIndustrieSlice := make([]string, 0)
 					for _, s := range industrieSlice {
-						newIndustrieSlice = append(newIndustrieSlice, "'"+ s + "'")
+						newIndustrieSlice = append(newIndustrieSlice, "'"+s+"'")
 					}
 					industryStr = strings.Join(newIndustrieSlice, ",")
 					industryStr = strings.TrimRight(industryStr, ",")
-					industriesCond += ` AND im.industry_name In (`+ industryStr +`) `
+					industriesCond += ` AND im.industry_name In (` + industryStr + `) `
 				}
 				subjectNamesCond := ``
 				var subjectNameStr string
 				if subjectName != "" {
 					subjectNameSlice := strings.Split(subjectName, ",")
-					newSubjectNameSlice := make([]string,0)
+					newSubjectNameSlice := make([]string, 0)
 					for _, s := range subjectNameSlice {
-						newSubjectNameSlice = append(newSubjectNameSlice, "'"+ s + "'")
+						newSubjectNameSlice = append(newSubjectNameSlice, "'"+s+"'")
 					}
 					subjectNameStr = strings.Join(newSubjectNameSlice, ",")
 					subjectNameStr = strings.TrimRight(subjectNameStr, ",")
-					subjectNamesCond += ` AND cis.subject_name In (`+ subjectNameStr +`) `
+					subjectNamesCond += ` AND cis.subject_name In (` + subjectNameStr + `) `
 				}
 				articleTypeCondSlice = append(articleTypeCondSlice, articleTypeCond)
 				activityTypesCondSlice = append(activityTypesCondSlice, activityTypesCond)
@@ -401,61 +402,61 @@ func (this *MobileHomeController) NewList() {
 		return
 	}
 
-	articleTypes = strings.TrimRight(articleTypes,",")
-	activityTypes = strings.TrimRight(activityTypes,",")
-	industries = strings.TrimRight(industries,",")
-	subjectNames = strings.TrimRight(subjectNames,",")
+	articleTypes = strings.TrimRight(articleTypes, ",")
+	activityTypes = strings.TrimRight(activityTypes, ",")
+	industries = strings.TrimRight(industries, ",")
+	subjectNames = strings.TrimRight(subjectNames, ",")
 
 	articleTypesCond := ``
 	var articleTypeStr string
 	if articleTypes != "" {
 		articleTypeSlice := strings.Split(articleTypes, ",")
-		newArticleTypeSlice := make([]string,0)
+		newArticleTypeSlice := make([]string, 0)
 		for _, s := range articleTypeSlice {
-			newArticleTypeSlice = append(newArticleTypeSlice, "'"+ s + "'")
+			newArticleTypeSlice = append(newArticleTypeSlice, "'"+s+"'")
 		}
 		articleTypeStr = strings.Join(newArticleTypeSlice, ",")
-		articleTypeStr = strings.TrimRight(articleTypeStr,",")
-		articleTypesCond += ` AND (art.sub_category_name In (`+ articleTypeStr +`) OR (art.article_type_name In (`+ articleTypeStr +`) AND art.article_type_name <> '路演精华' AND art.article_type_id <> 0 ) ) `
+		articleTypeStr = strings.TrimRight(articleTypeStr, ",")
+		articleTypesCond += ` AND (art.sub_category_name In (` + articleTypeStr + `) OR (art.article_type_name In (` + articleTypeStr + `) AND art.article_type_name <> '路演精华' AND art.article_type_id <> 0 ) ) `
 	}
 	activityTypesCond := ``
 	if activityTypes != "" {
 		activityTypeSlice := strings.Split(activityTypes, ",")
-		newActivityTypeSlice := make([]string,0)
+		newActivityTypeSlice := make([]string, 0)
 		for _, s := range activityTypeSlice {
-			newActivityTypeSlice = append(newActivityTypeSlice, "'"+ s + "'")
+			newActivityTypeSlice = append(newActivityTypeSlice, "'"+s+"'")
 		}
 		activityTypeStr := strings.Join(newActivityTypeSlice, ",")
-		activityTypeStr = strings.TrimRight(activityTypeStr,",")
-		activityTypesCond += ` AND act.activity_type_name In (`+ activityTypeStr +`) `
+		activityTypeStr = strings.TrimRight(activityTypeStr, ",")
+		activityTypesCond += ` AND act.activity_type_name In (` + activityTypeStr + `) `
 	}
 	industriesCond := ``
 	var industryStr string
 	if industries != "" {
 		industrieSlice := strings.Split(industries, ",")
-		newIndustrieSlice := make([]string,0)
+		newIndustrieSlice := make([]string, 0)
 		for _, s := range industrieSlice {
-			newIndustrieSlice = append(newIndustrieSlice, "'"+ s + "'")
+			newIndustrieSlice = append(newIndustrieSlice, "'"+s+"'")
 		}
 		industryStr = strings.Join(newIndustrieSlice, ",")
 		industryStr = strings.TrimRight(industryStr, ",")
-		industriesCond += ` AND im.industry_name In (`+ industryStr +`) `
+		industriesCond += ` AND im.industry_name In (` + industryStr + `) `
 	}
 	subjectNamesCond := ``
 	var subjectNameStr string
 	if subjectNames != "" {
 		subjectNameSlice := strings.Split(subjectNames, ",")
-		newSubjectNameSlice := make([]string,0)
+		newSubjectNameSlice := make([]string, 0)
 		for _, s := range subjectNameSlice {
-			newSubjectNameSlice = append(newSubjectNameSlice, "'"+ s + "'")
+			newSubjectNameSlice = append(newSubjectNameSlice, "'"+s+"'")
 		}
 		subjectNameStr = strings.Join(newSubjectNameSlice, ",")
 		subjectNameStr = strings.TrimRight(subjectNameStr, ",")
-		subjectNamesCond += ` AND cis.subject_name In (`+ subjectNameStr +`) `
+		subjectNamesCond += ` AND cis.subject_name In (` + subjectNameStr + `) `
 	}
 
-	var tagArticleIds,tagActivityIds, mmIds string
-	if articleTypesCond != "" || activityTypesCond != "" || industryStr != "" || subjectNameStr != ""{
+	var tagArticleIds, tagActivityIds, mmIds string
+	if articleTypesCond != "" || activityTypesCond != "" || industryStr != "" || subjectNameStr != "" {
 		tagArticleIds, tagActivityIds, mmIds, err = models.GetCygxCygxArticleListByCondition(articleTypesCond, activityTypesCond, industryStr, subjectNameStr, articleTypeStr)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
@@ -522,7 +523,6 @@ func (this *MobileHomeController) NewList() {
 		}
 		lenActivityIds := len(activityIds)
 
-
 		listActivitySpecial, _, err := services.GetActivitySpecialList(user, 1, 200, "", "", "")
 		if err != nil {
 			br.Msg = "获取失败"
@@ -536,7 +536,6 @@ func (this *MobileHomeController) NewList() {
 		}
 		lenActivityspecialIds := len(activityspecialIds)
 
-
 		if tagIds != "" {
 			if tagArticleIds != "" {
 				condition = ` AND ((source = 'article' AND source_id IN (` + tagArticleIds + `) ) `
@@ -574,12 +573,12 @@ func (this *MobileHomeController) NewList() {
 			pars = append(pars, activityIds)
 		}
 
-		if lenActivityspecialIds > 0  && tagIds == "" {
+		if lenActivityspecialIds > 0 && tagIds == "" {
 			condition += ` OR ( source = 'activityspecial' AND source_id IN (` + utils.GetOrmInReplace(lenActivityspecialIds) + `) ` + conditionInit + ` )   `
 			pars = append(pars, activityspecialIds)
 		}
 	}
-	fmt.Println("condition:",condition)
+	fmt.Println("condition:", condition)
 	total, err = models.GetResourceDataCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"