|
@@ -441,6 +441,10 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
|
|
|
|
|
|
for _, vList := range list {
|
|
for _, vList := range list {
|
|
for _, v := range mapItems {
|
|
for _, v := range mapItems {
|
|
|
|
+ //如果这些类型都为空,那么就不合并
|
|
|
|
+ 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 {
|
|
|
|
+ continue
|
|
|
|
+ }
|
|
if v.SourceId == vList.SourceId {
|
|
if v.SourceId == vList.SourceId {
|
|
items = append(items, v)
|
|
items = append(items, v)
|
|
}
|
|
}
|