no message

models/system/sys_admin.go

@@ -515,7 +515,7 @@ func GetRaiAdmin() (items []*AdminItem, err error) {
 // GetFiccEnterScoreAdmin 获取Ficc需要录分的研究员
 func GetFiccEnterScoreAdmin() (items []*AdminItem, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT   *  FROM admin WHERE group_name  IN('宏观组','建材组','有色组','能化组','海外组')  AND enabled = 1 `
+	sql := `SELECT   *  FROM admin_cygx WHERE group_name  IN('宏观组','建材组','有色组','能化组','海外组')  AND enabled = 1 `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

services/roadshow/calendar.go

@@ -709,6 +709,12 @@ func SyncCalendarFromShanghai(userPhone, startDate, endDate string) (err error)
 		}
 
 		for _, v := range list {
+			//展示优先级：1、customer_name 2、project_name 3、title 需求池953
+			if v.CustomerName != "" {
+				v.Title = v.CustomerName
+			} else if v.ProjectName != "" {
+				v.Title = v.ProjectName
+			}
 			if rsCalendarRelation, ok := rsCalendarRelationMap[v.ID]; ok {
 				//存在的话，那么就去查找对应的信息
 				if rsCalendarRelation.CalendarType == 1 {