Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

services/resource_data.go

@@ -447,7 +447,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			if v.Article == nil && v.Newchart == nil && v.Roadshow == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.Activityspecial == nil && v.Researchsummary == nil && v.Minutessummary == nil && v.Meetingreviewchapt == nil && v.ProductInterior == nil && v.IndustrialResource == nil && v.ReportSelection == nil && v.YanxuanSpecial == nil && v.AskserieVideo == nil {
 				continue
 			}
-			if v.SourceId == vList.SourceId {
+			if v.SourceId == vList.SourceId && v.Source == vList.Source {
 				items = append(items, v)
 			}
 		}