|
@@ -236,8 +236,7 @@ func (this *CalendarController) Add() {
|
|
|
}
|
|
|
remark := "请尽快完成审批"
|
|
|
//wxAppPath := "pages-approve/activity/detail?RsCalendarId=" + strconv.Itoa(int(rsCalendarId)) + "&RsCalendarResearcherId=" + strconv.Itoa(int(rsCalendarResearcherId))
|
|
|
- openIdList, _ := models.GetAdminOpenIdByMobile(sysAdmin.Mobile)
|
|
|
- if len(openIdList) > 0 {
|
|
|
+ if sysAdmin.OpenId != "" {
|
|
|
go services.SendWxMsgWithRoadshowPending(first, keyword1, keyword2, keyword3, keyword4, remark, wxAppPath, sysAdmin.Mobile)
|
|
|
}
|
|
|
} else {
|
|
@@ -247,8 +246,7 @@ func (this *CalendarController) Add() {
|
|
|
startDate = strings.Replace(startDate, "-", ".", -1)
|
|
|
keyword1 := "会议时间:" + startDate + "(" + researcher.StartWeek + ")" + " " + researcher.StartTime[:5] + "-" + researcher.EndTime[:5]
|
|
|
keyword2 := "--"
|
|
|
- openIdList, _ := models.GetAdminOpenIdByMobile(sysAdmin.Mobile)
|
|
|
- if len(openIdList) > 0 {
|
|
|
+ if sysAdmin.OpenId != "" {
|
|
|
go services.SendWxMsgWithRoadshowDeleteNotice(first, keyword1, keyword2, "", wxAppPath, sysAdmin.Mobile)
|
|
|
}
|
|
|
}
|
|
@@ -1364,8 +1362,7 @@ func (this *CalendarController) Edit() {
|
|
|
}
|
|
|
remark := "请尽快完成审批"
|
|
|
wxAppPath := "pages-approve/activity/detail?RsCalendarId=" + strconv.Itoa(req.RsCalendarId) + "&RsCalendarResearcherId=" + strconv.Itoa(rsCalendarResearcherItem.RsCalendarResearcherId)
|
|
|
- openIdList, _ := models.GetAdminOpenIdByMobile(sysAdmin.Mobile)
|
|
|
- if len(openIdList) > 0 {
|
|
|
+ if sysAdmin.OpenId != "" {
|
|
|
services.SendWxMsgWithRoadshowPending(first, keyword1, keyword2, keyword3, keyword4, remark, wxAppPath, sysAdmin.Mobile)
|
|
|
}
|
|
|
}
|
|
@@ -1443,8 +1440,7 @@ func (this *CalendarController) Edit() {
|
|
|
}
|
|
|
remark := "请尽快完成审批"
|
|
|
wxAppPath := "pages-approve/activity/detail?RsCalendarId=" + strconv.Itoa(req.RsCalendarId) + "&RsCalendarResearcherId=" + strconv.Itoa(int(rsCalendarResearcherId))
|
|
|
- openIdList, _ := models.GetAdminOpenIdByMobile(sysAdmin.Mobile)
|
|
|
- if len(openIdList) > 0 {
|
|
|
+ if sysAdmin.OpenId != "" {
|
|
|
services.SendWxMsgWithRoadshowPending(first, keyword1, keyword2, keyword3, keyword4, remark, wxAppPath, sysAdmin.Mobile)
|
|
|
}
|
|
|
}
|
|
@@ -1592,7 +1588,7 @@ func (this *CalendarController) Delete() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- rsCalendarResearcherItemList, err := roadshow.GetRsCalendarResearcherListById(req.RsCalendarResearcherId)
|
|
|
+ rsCalendarResearcherItemList, err := roadshow.GetRsCalendarResearcherListById(req.RsCalendarId)
|
|
|
if err != nil {
|
|
|
this.FailWithMessage("获取数据失败!", "获取数据失败!GetRsCalendarResearcherById:"+err.Error())
|
|
|
return
|
|
@@ -1690,8 +1686,7 @@ func (this *CalendarController) Delete() {
|
|
|
keyword2 := "已删除"
|
|
|
remark := req.DeleteReason
|
|
|
|
|
|
- openIdList, _ := models.GetAdminOpenIdByMobile(sysAdmin.Mobile)
|
|
|
- if len(openIdList) > 0 {
|
|
|
+ if sysAdmin.OpenId != "" {
|
|
|
go services.SendWxMsgWithRoadshowDeleteNotice(first, keyword1, keyword2, remark, wxAppPath, sysAdmin.Mobile)
|
|
|
}
|
|
|
}
|