|
@@ -64,7 +64,7 @@ func (this *ActivityController) LabelTypeList() {
|
|
sortTime = ` timesort DESC `
|
|
sortTime = ` timesort DESC `
|
|
}
|
|
}
|
|
|
|
|
|
- activityList, err := models.GetCygxActivityList(condition, pars, sortTime, 0, 1000)
|
|
|
|
|
|
+ activityList, err := models.GetCygxActivityList(condition, pars, sortTime, 0, 1)
|
|
if err != nil {
|
|
if err != nil {
|
|
br.Msg = "获取失败"
|
|
br.Msg = "获取失败"
|
|
br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
@@ -88,11 +88,12 @@ func (this *ActivityController) LabelTypeList() {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
- if len(speciaItem.List) > 0 {
|
|
|
|
- list = append(list, speciaItem)
|
|
|
|
- } else {
|
|
|
|
- speciaItem.List = make([]*models.CygxActivityLabelList, 0)
|
|
|
|
- }
|
|
|
|
|
|
+ list = append(list, speciaItem)
|
|
|
|
+ //if len(speciaItem.List) > 0 {
|
|
|
|
+ //
|
|
|
|
+ //} else {
|
|
|
|
+ // speciaItem.List = make([]*models.CygxActivityLabelList, 0)
|
|
|
|
+ //}
|
|
|
|
|
|
resp := new(models.ActivityTypeListHomeResp)
|
|
resp := new(models.ActivityTypeListHomeResp)
|
|
resp.List = list
|
|
resp.List = list
|
|
@@ -1469,7 +1470,7 @@ func (this *ActivityController) AskAdd() {
|
|
if openIpItem != nil && openIpItem.OpenId != "" {
|
|
if openIpItem != nil && openIpItem.OpenId != "" {
|
|
if sellerItem != nil {
|
|
if sellerItem != nil {
|
|
|
|
|
|
- //services.SendActivityAskApplyTemplateMsgV2(user.RealName+"——"+user.CompanyName, "所属销售:"+sellerItem.RealName, time.Now().Format(utils.FormatDateTime), req.Content, activityInfo.ActivityName, openIpItem, activityInfo)
|
|
|
|
|
|
+ services.SendActivityAskApplyTemplateMsgV2(user.RealName+"——"+user.CompanyName, "所属销售:"+sellerItem.RealName, time.Now().Format(utils.FormatDateTime), req.Content, activityInfo.ActivityName, openIpItem, activityInfo)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1477,7 +1478,7 @@ func (this *ActivityController) AskAdd() {
|
|
if sellerItem != nil {
|
|
if sellerItem != nil {
|
|
openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
|
|
openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
|
|
if openIpItem != nil && openIpItem.OpenId != "" {
|
|
if openIpItem != nil && openIpItem.OpenId != "" {
|
|
- //services.SendActivityAskApplyTemplateMsgV2(user.RealName+"——"+user.CompanyName, "所属销售:"+sellerItem.RealName, time.Now().Format(utils.FormatDateTime), req.Content, activityInfo.ActivityName, openIpItem, activityInfo)
|
|
|
|
|
|
+ services.SendActivityAskApplyTemplateMsgV2(user.RealName+"——"+user.CompanyName, "所属销售:"+sellerItem.RealName, time.Now().Format(utils.FormatDateTime), req.Content, activityInfo.ActivityName, openIpItem, activityInfo)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|