Merge branch 'crm/need_970' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/roadshow/calendar.go

@@ -1159,7 +1159,8 @@ func (this *CalendarController) CalendarList() {
 		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_FICC_TEAM {
+		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_TEAM ||
+		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
 		condition += ` AND a.sys_user_id=?`
 		pars = append(pars, sysUser.AdminId)
 		//condition += ` AND a.activity_type IN('路演','公开会议') `
@@ -1170,8 +1171,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 {
 		if calendarType != 3 {
 			condition += ` AND b.researcher_id=?`
 			pars = append(pars, sysUser.AdminId)
@@ -1259,8 +1259,8 @@ func (this *CalendarController) CalendarList() {
 			br.ErrMsg = "获取管理员信息失败, Err:" + e.Error()
 			return
 		}
-		for _, v := range listAdmin { //权益销售与权益销售组长
-			if v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER || v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP {
+		for _, v := range listAdmin { //权益销售与权益销售组长、权益管理员
+			if v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER || v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP || v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
 				mapRaiSllerId[v.AdminId] = true
 			}
 		}