修改删除

controllers/roadshow/calendar.go

@@ -1535,30 +1535,30 @@ func (this *CalendarController) Delete() {
 	var req roadshow.DeleteReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
-		this.FailWithMessage("参数解析异常!", "参数解析失败，Err:"+err.Error())
+		this.FailWithMessage("参数解析异常！", "参数解析失败，Err:" + err.Error())
 		return
 	}
 
 	if req.RsCalendarId <= 0 || req.RsCalendarResearcherId <= 0 {
-		this.FailWithMessage("参数错误!", "参数错误！RsCalendarId:"+strconv.Itoa(req.RsCalendarId)+";RsCalendarResearcherId:"+strconv.Itoa(req.RsCalendarResearcherId))
+		this.FailWithMessage("参数错误！", "参数错误！RsCalendarId:" + strconv.Itoa(req.RsCalendarId) + ";RsCalendarResearcherId:" + strconv.Itoa(req.RsCalendarResearcherId))
 		return
 	}
 	rsCalendarItem, err := roadshow.GetRsCalendarById(req.RsCalendarId)
 	if err != nil {
-		this.FailWithMessage("获取数据失败!", "获取数据失败！GetRsCalendarById:"+err.Error())
+		this.FailWithMessage("获取数据失败！", "获取数据失败！GetRsCalendarById:" + err.Error())
 		return
 	}
 
 	rsCalendarResearcherItem, err := roadshow.GetRsCalendarResearcherById(req.RsCalendarResearcherId)
 	if err != nil {
-		this.FailWithMessage("获取数据失败!", "获取数据失败！GetRsCalendarResearcherById:"+err.Error())
+		this.FailWithMessage("获取数据失败！", "获取数据失败！GetRsCalendarResearcherById:" + err.Error())
 		return
 	}
 
 	if rsCalendarItem.ActivityType == "报告电话会" || rsCalendarItem.ActivityType == "内部会议" {
 		err = roadshow.DeleteCalendar(req.RsCalendarId, req.RsCalendarResearcherId)
 		if err != nil {
-			this.FailWithMessage("删除失败!", "删除失败！DeleteCalendar:"+err.Error())
+			this.FailWithMessage("删除失败！", "删除失败！DeleteCalendar:" + err.Error())
 			return
 		}
 	} else {
@@ -1575,7 +1575,7 @@ func (this *CalendarController) Delete() {
 
 		err = roadshow.UpdateCalendarResearcher(whereParams, updateParams)
 		if err != nil {
-			this.FailWithMessage("删除失败!", "删除失败！UpdateCalendarResearcher:"+err.Error())
+			this.FailWithMessage("删除失败！", "删除失败！UpdateCalendarResearcher:" + err.Error())
 			return
 		}
 	}
@@ -1589,19 +1589,18 @@ func (this *CalendarController) Delete() {
 		go func() {
 			if rsCalendarItem != nil && rsCalendarResearcherItem != nil {
 				sysAdmin, _ := admin.GetAdminById(rsCalendarResearcherItem.ResearcherId)
-				first := "【" + sysUser.RealName + "】删除了你的【路演】安排"
-				var keyword1 string
-				if rsCalendarItem.ActivityType == "路演" {
-					keyword1 = rsCalendarItem.CompanyName + "，" + rsCalendarItem.RoadshowType + rsCalendarItem.ActivityType
-				} else {
-					keyword1 = rsCalendarItem.Theme + "，" + rsCalendarItem.RoadshowType + rsCalendarItem.ActivityType
-				}
-				keyword2 := "已删除"
-				remark := req.DeleteReason
-				wxAppPath := "pages-approve/activity/detail?RsCalendarId=" + strconv.Itoa(rsCalendarItem.RsCalendarId) + "&RsCalendarResearcherId=" + strconv.Itoa(rsCalendarResearcherItem.RsCalendarResearcherId)
-				openIdList, _ := models.GetAdminOpenIdByMobile(sysAdmin.Mobile)
-				if len(openIdList) > 0 {
-					services.SendWxMsgWithRoadshowDeleteNotice(first, keyword1, keyword2, remark, wxAppPath, sysAdmin.Mobile)
+				if sysAdmin != nil && sysAdmin.Mobile != "" {
+					first := "【" + sysUser.RealName + "】删除了你的【路演】安排"
+					var keyword1 string
+					if rsCalendarItem.ActivityType == "路演" {
+						keyword1 = rsCalendarItem.CompanyName + "，" + rsCalendarItem.RoadshowType + rsCalendarItem.ActivityType
+					} else {
+						keyword1 = rsCalendarItem.Theme + "，" + rsCalendarItem.RoadshowType + rsCalendarItem.ActivityType
+					}
+					keyword2 := "已删除"
+					remark := req.DeleteReason
+					wxAppPath := "pages-approve/activity/detail?RsCalendarId=" + strconv.Itoa(rsCalendarItem.RsCalendarId) + "&RsCalendarResearcherId=" + strconv.Itoa(rsCalendarResearcherItem.RsCalendarResearcherId)
+					go services.SendWxMsgWithRoadshowDeleteNotice(first, keyword1, keyword2, remark, wxAppPath, sysAdmin.Mobile)
 				}
 			}
 		}()

models/roadshow/calendar.go

@@ -4,7 +4,6 @@ import (
 	"github.com/rdlucklib/rdluck_tools/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_mobile_admin/models/tables/admin"
-	"hongze/hongze_mobile_admin/utils"
 	"time"
 )
 
@@ -480,19 +479,24 @@ func DeleteCalendar(rsCalendarId, rsCalendarResearcherId int) (err error) {
 	if err != nil {
 		return err
 	}
-	var count int
-	sql = ` SELECT COUNT(1) AS count FROM rs_calendar_researcher WHERE rs_calendar_id=? `
-	err = o.Raw(sql, rsCalendarId).QueryRow(&count)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	//var count int
+	//sql = ` SELECT COUNT(1) AS count FROM rs_calendar_researcher WHERE rs_calendar_id=? `
+	//err = o.Raw(sql, rsCalendarId).QueryRow(&count)
+	//if err != nil && err.Error() != utils.ErrNoRow() {
+	//	return err
+	//}
+	//if count <= 0 {
+	//	sql := ` DELETE FROM rs_calendar WHERE rs_calendar_id=? `
+	//	_, err = o.Raw(sql, rsCalendarId).Exec()
+	//	if err != nil {
+	//		return err
+	//	}
+	//}
+	sql = ` DELETE FROM rs_calendar WHERE rs_calendar_id=? `
+	_, err = o.Raw(sql, rsCalendarId).Exec()
+	if err != nil {
 		return err
 	}
-	if count <= 0 {
-		sql := ` DELETE FROM rs_calendar WHERE rs_calendar_id=? `
-		_, err = o.Raw(sql, rsCalendarId).Exec()
-		if err != nil {
-			return err
-		}
-	}
 	return err
 }