Merge branch 'cygx_13.8' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/activity_special.go

@@ -655,7 +655,7 @@ func GetSpecialTripUserSchedule(userId int) (total int, err error) {
 
 // GetActivitySpecialList 获取专项调研列表
 func GetActivitySpecialList(user *models.WxUserItem, currentIndex, pageSize int, keywords string) (list []*models.CygxActivitySpecialDetail, total int, err error) {
-	if user.CompanyId < 1 {
+	if user.CompanyId <= 1 {
 		return
 	}
 	listConfirm, totalConfirm, e := GetActivityLabelSpecialConfirmList(user, (currentIndex-1)*pageSize, pageSize, 4, keywords)

services/es_comprehensive.go

@@ -1556,7 +1556,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	keyWord = "%" + keyWord + "%"
 	var conditionTitle string
 	var parsTitle []interface{}
-	conditionTitle = " AND search_title LIKE ? AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
+	conditionTitle = " AND is_hide = 0  AND search_title LIKE ? AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
 	parsTitle = append(parsTitle, keyWord)
 	totalTitle, e := models.GetResourceDataCount(conditionTitle, parsTitle)
 	if e != nil {
@@ -1567,7 +1567,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	var conditionContent string
 	var parsContent []interface{}
 
-	conditionContent = " AND search_content LIKE ? AND search_title  NOT LIKE ?  AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
+	conditionContent = " AND is_hide = 0 AND search_content LIKE ? AND search_title  NOT LIKE ?  AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
 	parsContent = append(parsContent, keyWord, keyWord)
 	totalContent, e := models.GetResourceDataCount(conditionContent, parsContent)
 	if e != nil {

services/ficc_report.go

@@ -468,6 +468,8 @@ func GetFiccRreportToCygxArticle() (err error) {
 		item.Abstract = v.Abstract
 		item.CreateDate = time.Now().Format(utils.FormatDate)
 		item.PublishStatus = 1
+		item.IsReport = 1
+		item.IsClass = 1
 		if (v.ClassifyNameFirst == "宏观报告" && v.ClassifyNameSecond == "大类资产周报") || (v.ClassifyNameFirst == "晨会纪要" && v.ClassifyNameSecond == "晨会纪要") {
 			item.SubCategoryName = "产业跟踪"
 			item.MatchTypeName = "产业跟踪"