Merge branch 'cygx_14.2' of http://8.136.199.33:3000/hongze/hongze_clpt into debug

models/report.go

@@ -1023,6 +1023,7 @@ func GetArticleResearchListYx(condition string, pars []interface{}, startSize, p
 func GetArticleResearchAndYxSpecialList(condition, conditionYxSpecial string, pars []interface{}, startSize, pageSize, userId int, needYanxuanSpecial bool) (total int, items []*ArticleListResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
+   			a.category_id,
 			a.article_id,
 			a.title,
 			a.body,
@@ -1054,6 +1055,7 @@ func GetArticleResearchAndYxSpecialList(condition, conditionYxSpecial string, pa
 	if needYanxuanSpecial {
 		sql += `UNION ALL
 	SELECT
+		0 as category_id,
 		a.id AS article_id,
 		a.title AS title,
 		'' AS body,

services/es_comprehensive.go

@@ -549,7 +549,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			mapItems[fmt.Sprint("activity", v.ActivityId)].Activity = v
 		}
 	}
-
+	fmt.Println(industrialResourceIdsHz)
 	//产业资源包
 	if len(industrialResourceIdsHz) > 0 {
 		pars = make([]interface{}, 0)
@@ -587,11 +587,14 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			if v.TimeLineData == "" {
 				v.ListTimeLine = make([]models.TimeLineReportResp, 0)
 			} else {
+				fmt.Println(v.TimeLineData)
 				if err = json.Unmarshal([]byte(v.TimeLineData), &v.ListTimeLine); err != nil {
+					fmt.Println(err)
 					e = errors.New("Unmarshal, Err: " + e.Error())
 					return
 				}
 			}
+			fmt.Println(v.ListTimeLine)
 			v.Source = 1
 			v.UpdateTime = v.PublishDate
 			mapItems[fmt.Sprint("industrialsourceHz", v.IndustrialManagementId)].IndustrialResource = v
@@ -613,7 +616,6 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			err = errors.New("GetSearchResourceList, Err: " + e.Error())
 			return
 		}
-		fmt.Println(listIndustrialResourceIds)
 		conditionSubject := condition + ` AND 	m.industrial_management_id  IN (` + utils.GetOrmInReplace(len(industrialResourceIdsYx)) + `)`
 		pars = append(pars, industrialResourceIdsYx)
 		listSubjcet, e := models.GetIndustrialSubjectAllByIndustrialId(pars, conditionSubject)

services/industrial_management.go

@@ -315,9 +315,9 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 			}
 		}
 		if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
-			v.Source = 1
-		} else {
 			v.Source = 2
+		} else {
+			v.Source = 1
 		}
 
 		if v.TimeLineData == "" {