Merge branch 'crm_need_977' of http://8.136.199.33:3000/hongze/hongze_mobile_admin

controllers/roadshow/calendar.go

@@ -2148,11 +2148,12 @@ func (this *CalendarController) MyCalendarDetail() {
 	if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP {
+		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP ||
+		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN { // 王芳也作为销售身份处理 {
 		condition += ` AND a.sys_user_id=?`
 		pars = append(pars, sysUser.AdminId)
 
-		condition += ` AND a.activity_type IN('路演','公开会议') `
+		condition += ` AND a.activity_type IN('路演','公开会议','沙龙') `
 	}
 
 	//研究员