|
@@ -172,15 +172,15 @@ func (this *UserRaiLabelController) Detail() {
|
|
|
resp.Activity = item
|
|
|
case 3, 5:
|
|
|
item := new(cygx.WxUserRaiLabelRoadShowResp)
|
|
|
- rsCalendarItem, err := roadshow.GetRsCalendarById(sourceId)
|
|
|
+ rsCalendarMeetingUserItem, err := roadshow.GetRsCalendarMeetingUserFirst(sourceId)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取数据失败!"
|
|
|
- br.ErrMsg = "获取数据失败!GetRsCalendarById:" + err.Error()
|
|
|
+ br.ErrMsg = "获取数据失败!GetRsCalendarMeetingUserFirst:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- if rsCalendarItem == nil {
|
|
|
- br.Msg = "保存失败!"
|
|
|
- br.ErrMsg = "获取数据失败!GetRsCalendarById:" + err.Error()
|
|
|
+ if rsCalendarMeetingUserItem == nil {
|
|
|
+ br.Msg = "获取数据失败!"
|
|
|
+ br.ErrMsg = "获取数据失败!GetRsCalendarMeetingUserFirst:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
rsCalendarResearcherList, tmpErr := roadshow.GetRsCalendarResearcherListByRsCalendarId(sourceId)
|
|
@@ -193,7 +193,7 @@ func (this *UserRaiLabelController) Detail() {
|
|
|
item.ResearcherName = v.ResearcherName
|
|
|
item.RoadShowTime = v.StartDate + " " + v.StartTime
|
|
|
}
|
|
|
- item.Theme = rsCalendarItem.Theme
|
|
|
+ item.Theme = rsCalendarMeetingUserItem.RoadShowTheme
|
|
|
item.Label = detail.Label
|
|
|
resp.RoadShow = item
|
|
|
case 6:
|