fix

controllers/roadshow/calendar.go

@@ -174,15 +174,15 @@ func (this *CalendarController) Add() {
 		br.IsSendEmail = false
 		return
 	}
-	sysUserList, err := system.GetAdminList()
+	sysUserList, err := cygx.GetAskEmailList()
 	if err != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取admin列表失败, Err:" + err.Error()
+		br.ErrMsg = "获取失败,GetAskEmailList Err: " + err.Error()
 		return
 	}
-	adminMap := make(map[int]*system.Admin, 0)
+	raiAskadminMap := make(map[int]bool, 0)
 	for _, v := range sysUserList {
-		adminMap[v.AdminId] = v
+		raiAskadminMap[v.AdminId] = true
 	}
 
 	rsCalendar := new(roadshow.RsCalendar)
@@ -234,7 +234,7 @@ func (this *CalendarController) Add() {
 		}
 
 		//CRM15.5 权益研究员直接通过
-		if adminMap[v.ResearcherId].DepartmentId == utils.RAI_DEPARTMENT_ID {
+		if raiAskadminMap[v.ResearcherId] {
 			researcher.Status = 2
 		}
 

models/roadshow/calendar.go

@@ -339,7 +339,7 @@ func GetCalendarList(condition string, pars []interface{}, startSize, pageSize,
 
 		_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
 	} else {
-		sql := `SELECT a.rs_calendar_id,a.activity_type,a.roadshow_type,a.activity_category,a.roadshow_platform,b.create_time,
+		sql := `SELECT a.rs_calendar_id,a.activity_type,a.roadshow_type,a.activity_category,a.roadshow_platform,b.create_time,a.district,
 				b.modify_time,b.researcher_id,b.researcher_name,
 				b.rs_calendar_researcher_id,b.start_date,
 				b.end_date,b.start_time,b.end_time,b.start_week,b.end_week,b.status,b.refuse_reason,b.refuse_time,