|
|
@@ -1180,7 +1180,7 @@ func (this *CalendarController) CalendarList() {
|
|
|
}
|
|
|
if calendarType == 2 {
|
|
|
condition += ` AND b.status>=2`
|
|
|
- condition += ` AND a.activity_type IN('路演','公开会议') `
|
|
|
+ condition += ` AND a.activity_type IN('路演','公开会议','沙龙') `
|
|
|
}
|
|
|
if calendarType == 3 {
|
|
|
condition += ` AND a.activity_type='内部会议' `
|
|
|
@@ -2288,6 +2288,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 {
|
|
|
@@ -2488,7 +2494,7 @@ func getTitle(activityType, roadshowType, activityCategory, roadshowPlatform, pr
|
|
|
switch activityType {
|
|
|
case "内部会议":
|
|
|
title = "内部会议"
|
|
|
- case "公开会议", "路演":
|
|
|
+ case "公开会议", "路演", "沙龙":
|
|
|
if roadshowType == "线上" {
|
|
|
title = roadshowType + activityType + roadshowPlatform
|
|
|
} else {
|
xingzai