Merge branch 'cygx/cygx_14_7' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/roadshow/calendar.go

@@ -1929,6 +1929,12 @@ func (this *CalendarController) Delete() {
 		}
 	}
 
+	roleTypeCode := sysUser.RoleTypeCode
+	if rsCalendarItem.CompanyId > 0 && rsCalendarItem.ActivityType == "路演" && (roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
+		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP || roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN) {
+		go cygxService.SpecialActivityPointsBillRoadShow(req.RsCalendarId, sysUser.AdminId)
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "删除成功"

services/roadshow/calendar.go

@@ -1143,7 +1143,7 @@ func CheckAddRoadShowCompanyPoint(companyId int, researcherList []*roadshow.Cale
 	}
 
 	pointsCompany, e := cygx.GetCygxActivitySpecialPermissionPointsCount(companyId)
-	if e != nil {
+	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetCygxActivitySpecialPermissionPointsCount, Err: " + e.Error())
 		return
 	}