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

controllers/roadshow/calendar.go

@@ -2152,7 +2152,7 @@ func (this *CalendarController) MyCalendarDetail() {
 		condition += ` AND a.sys_user_id=?`
 		pars = append(pars, sysUser.AdminId)
 
-		condition += ` AND a.activity_type IN('路演','公开会议') `
+		condition += ` AND a.activity_type IN('路演','公开会议','沙龙') `
 	}
 
 	//研究员
@@ -2175,7 +2175,7 @@ func (this *CalendarController) MyCalendarDetail() {
 	}
 
 	//中级/普通/admin 管理员
-	if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
+	if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN || roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
 		condition += ` AND a.sys_user_id=?`
 		pars = append(pars, sysUser.AdminId)
 	}