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

controllers/roadshow/calendar.go

@@ -2160,7 +2160,8 @@ func (this *CalendarController) MyCalendarDetail() {
 		roleTypeCode == utils.ROLE_TYPE_CODE_RESEARCHR ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_RESEARCHR ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER {
+		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
+		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN { // 王芳也作为销售身份处理
 		condition += ` AND b.researcher_id=?`
 		pars = append(pars, sysUser.AdminId)
 
@@ -2175,7 +2176,7 @@ func (this *CalendarController) MyCalendarDetail() {
 	}
 
 	//中级/普通/admin 管理员
-	if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN || roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
+	if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
 		condition += ` AND a.sys_user_id=?`
 		pars = append(pars, sysUser.AdminId)
 	}