Merge branch 'cygx_8.2.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/article.go

@@ -88,6 +88,11 @@ func (this *ArticleController) Detail() {
 			br.ErrMsg = "获取信息失败,Err:" + err.Error()
 			return
 		}
+		//是否属于专项调研报告
+		if detail.SubCategoryName == "专项调研" {
+			detail.IsSpecialArticle = true
+		}
+		detail.PublishDate = utils.TimeRemoveHms(detail.PublishDate)
 		detail.Body = html.UnescapeString(detail.Body)
 		detail.Body = strings.Replace(detail.Body, "<p data-f-id=\"pbf\" style=\"text-align: center; font-size: 14px; margin-top: 30px; opacity: 0.65; font-family: sans-serif;\">Powered by <a href=\"https://www.froala.com/wysiwyg-editor?pb=1\" title=\"Froala Editor\">Froala Editor</a></p>", "", -1)
 		detail.Body = strings.Replace(detail.Body, "pre", "div", -1)
@@ -140,16 +145,13 @@ func (this *ArticleController) Detail() {
 			if userType == 1 && strings.Contains(detail.CategoryName, "研选") {
 				hasPersion = false
 			}
-
 			if detail.IsReport == 1 {
-				fmt.Println("报告权限")
 				detailCategory, err := models.GetdetailByCategoryIdSando(detail.CategoryId)
 				if err != nil && err.Error() != utils.ErrNoRow() {
 					br.Msg = "获取信息失败"
 					br.ErrMsg = "获取信息失败,Err:" + err.Error() + "categoryID 不存在：" + strconv.Itoa(detail.CategoryId)
 					return
 				}
-				fmt.Println(detailCategory)
 				permissionStr, err := models.GetCompanyPermissionByUser(user.CompanyId)
 				if err != nil {
 					br.Msg = "获取信息失败"

controllers/search.go

@@ -619,6 +619,7 @@ func (this *SearchController) ListHomeArtAndChartPage() {
 				result[k].ImgUrlPc = mapCategoryUrl[v.CategoryId]
 			}
 			result[k].Source = 1
+			v.PublishDate = utils.TimeRemoveHms(v.PublishDate)
 		}
 	}
 	//记录用户搜索关键词

models/article.go

@@ -152,6 +152,7 @@ type ArticleDetail struct {
 	ReportLink              string `description:"报告链接"`
 	IsShowLinkButton        int    `description:"这种报告类型是否展示查看报告链接"`
 	ArticleTypeId           int    `description:"文章类型ID"`
+	IsSpecialArticle        bool   `description:"是否属于专项调研报告"`
 }
 
 type ArticleDetailFileLink struct {

services/activity.go

@@ -1633,9 +1633,9 @@ func GetActivityVideoResp(mapActivityId []int) (mapItem map[int]*models.CygxActi
 	ativityVIdstr = strings.TrimRight(ativityVIdstr, ",")
 	condition += ` AND art.activity_id IN  (` + ativityVIdstr + `) `
 	var pars []interface{}
-	endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
-	condition += ` AND art.activity_time > ? `
-	pars = append(pars, endTime)
+	//endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
+	//condition += ` AND art.activity_time > ? `
+	//pars = append(pars, endTime)
 	videoList, e := models.GetActivityVideoListAll(condition, pars, 0, 1000)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = e