Merge branch 'CRM_15.6' into debug

controllers/roadshow/report.go

@@ -1586,12 +1586,19 @@ func (this *CalendarController) OverseasResearcherReportList() {
 			tmpAllFormalNumMap[index] += tmpFormalNum
 			tmpAllMeetingNumMap[index] += tmpCloseNum
 		}
-		tmpAdminReportRecord := roadshow.OverseasAdminReportRecord{
-			Name:                  researcher.RealName,
-			AdminId:               researcher.AdminId,
-			RsReportRecordNumList: tmpAdminRsReportRecordNumList,
+		// 数据都为0的时候不显示
+		adminTotalNum := 0
+		for _, v := range tmpAdminRsReportRecordNumList {
+			adminTotalNum += v.TryOutNum + v.CloseNum + v.FormalNum
+		}
+		if adminTotalNum > 0 {
+			tmpAdminReportRecord := roadshow.OverseasAdminReportRecord{
+				Name:                  researcher.RealName,
+				AdminId:               researcher.AdminId,
+				RsReportRecordNumList: tmpAdminRsReportRecordNumList,
+			}
+			RsReportRecordResp.List = append(RsReportRecordResp.List, tmpAdminReportRecord)
 		}
-		RsReportRecordResp.List = append(RsReportRecordResp.List, tmpAdminReportRecord)
 	}
 
 	//总体汇总数据