Merge branch 'CRM_15.5' of http://8.136.199.33:3000/hongze/hongze_mobile_admin into debug

controllers/roadshow/calendar.go

@@ -334,7 +334,7 @@ func (this *CalendarController) CalendarList() {
 		pars = append(pars, adminItem.AdminId)
 	}
 
-	condition += ` AND a.activity_type IN('路演','公开会议') `
+	condition += ` AND a.activity_type IN('路演','公开会议','沙龙') `
 
 	if status == 1 {
 		condition += ` AND b.status=?`
@@ -1176,7 +1176,7 @@ func getTitle(activityType, roadshowType, activityCategory, roadshowPlatform, pr
 	switch activityType {
 	case "内部会议":
 		title = "内部会议"
-	case "公开会议", "路演":
+	case "公开会议", "路演", "沙龙":
 		if roadshowType == "线上" {
 			title = roadshowType + activityType + roadshowPlatform
 		} else {
@@ -1672,7 +1672,6 @@ func (this *CalendarController) ResearcherList() {
 	ficcGroup.GroupName = "ficc"
 	ficcGroup.ResearcherList = group
 
-
 	sysUserList, err := system.GetAdminList()
 	if err != nil {
 		this.FailWithMessage("获取失败!", "获取失败,获取admin列表失败 Err:"+err.Error())
@@ -2026,6 +2025,12 @@ func (this *CalendarController) ResearcherCalendarDetail() {
 
 	if calendarList == nil {
 		calendarList = make([]*roadshow.CalendarListView, 0)
+	} else {
+		for _, v := range calendarList { //上海同步过来信息展示逻辑替换 需求池 953
+			if v.Source == 1 && v.CompanyName == "" {
+				v.CompanyName = v.Title
+			}
+		}
 	}
 
 	if matterList == nil {