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

controllers/roadshow/calendar.go

@@ -319,7 +319,8 @@ func (this *CalendarController) CalendarList() {
 	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, adminItem.AdminId)
 	}
@@ -329,8 +330,7 @@ func (this *CalendarController) CalendarList() {
 		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_RESEARCHR ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_DEPARTMENT ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_DEPARTMENT ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
+		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
 		condition += ` AND b.researcher_id=?`
 		pars = append(pars, adminItem.AdminId)
 	}