|
@@ -63,6 +63,16 @@ func (this *CalendarController) Add() {
|
|
|
|
|
|
researcherMap := make(map[int]string)
|
|
researcherMap := make(map[int]string)
|
|
var checkIsAdd []string
|
|
var checkIsAdd []string
|
|
|
|
+
|
|
|
|
+ sysUserList, err := cygx.GetAskEmailList()
|
|
|
|
+ if err != nil {
|
|
|
|
+ this.FailWithMessage("获取失败!", "获取失败,GetAskEmailList Err:"+err.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ raiAskadminMap := make(map[int]bool, 0)
|
|
|
|
+ for _, v := range sysUserList {
|
|
|
|
+ raiAskadminMap[v.AdminId] = true
|
|
|
|
+ }
|
|
//var tipMsg string
|
|
//var tipMsg string
|
|
for _, v := range req.ResearcherList {
|
|
for _, v := range req.ResearcherList {
|
|
if v.ResearcherId <= 0 {
|
|
if v.ResearcherId <= 0 {
|
|
@@ -99,6 +109,11 @@ func (this *CalendarController) Add() {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if req.ActivityType == "沙龙" && !raiAskadminMap[v.ResearcherId] {
|
|
|
|
+ this.FailWithMessage("ficc研究员暂不支持添加沙龙", "ficc研究员暂不支持添加沙龙")
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
startDateTime := v.StartDate + " " + v.StartTime
|
|
startDateTime := v.StartDate + " " + v.StartTime
|
|
endDateTime := v.EndDate + " " + v.EndTime
|
|
endDateTime := v.EndDate + " " + v.EndTime
|
|
|
|
|
|
@@ -164,16 +179,6 @@ func (this *CalendarController) Add() {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
- sysUserList, err := cygx.GetAskEmailList()
|
|
|
|
- if err != nil {
|
|
|
|
- this.FailWithMessage("获取失败!", "获取失败,GetAskEmailList Err:"+err.Error())
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
- raiAskadminMap := make(map[int]bool, 0)
|
|
|
|
- for _, v := range sysUserList {
|
|
|
|
- raiAskadminMap[v.AdminId] = true
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
rsCalendar := new(roadshow.RsCalendar)
|
|
rsCalendar := new(roadshow.RsCalendar)
|
|
rsCalendar.SysUserId = sysUser.AdminId
|
|
rsCalendar.SysUserId = sysUser.AdminId
|
|
rsCalendar.SysUserRealName = sysUser.RealName
|
|
rsCalendar.SysUserRealName = sysUser.RealName
|