标签列表bug修改

controllers/activity.go

@@ -1735,6 +1735,12 @@ func (this *ActivityCoAntroller) LabelList() {
 	} else {
 		//行业名称
 		condition = ` AND art.publish_status = 1  AND art.label != '' `
+		if len(chartPermissionIds) > 0 {
+			condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
+		}
+		if activityTypeIds != "" {
+			condition += ` AND art.activity_type_id  IN (` + activityTypeIds + `)`
+		}
 		var conditionOr string
 
 		if whichDay != "" {
@@ -1766,14 +1772,7 @@ func (this *ActivityCoAntroller) LabelList() {
 		}
 		conditionOr += `	OR ( art.is_limit_people = 0 	  ` + condition + `) `
 		condition += `AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
-		if len(chartPermissionIds) > 0 {
-			condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-		}
-		if activityTypeIds != "" {
-			condition += ` AND art.activity_type_id  IN (` + activityTypeIds + `)`
-		}
 	}
-
 	list, errList := models.GetActivityLabelListAll(condition, pars, startSize, pageSize)
 	if errList != nil {
 		br.Msg = "获取失败"
@@ -1788,10 +1787,9 @@ func (this *ActivityCoAntroller) LabelList() {
 	br.Data = resp
 }
 
-// @Title 上传参会表格
+// @Title 上传公司名称excel
 // @Description 上传参会表格数据
 // @Param   File   query   file  true       "文件"
-// @Param   ActivityId   query   int  true     "活动ID"
 // @Success 200 Ret=200 导入成功
 // @router /activityMeet/import [post]
 func (this *ActivityCoAntroller) Import() {

controllers/article.go

@@ -473,6 +473,7 @@ func (this *ArticleCommonController) Detail() {
 			}
 		}
 	}
+	detail.Abstract, _ = services.GetReportContentTextSub(detail.Abstract)
 	detail.SellerList = sellerList
 	resp.Detail = detail
 	br.Ret = 200

models/activity.go

@@ -145,6 +145,7 @@ type CygxActivityList struct {
 	ActiveState             string `description:"活动进行状态 未开始：1、进行中2、已结束3"`
 	IsCancelMeetingReminder int    `description:"是否取消会议提醒 1展示取消会议提醒 ，0展示会议提醒"`
 	IsBrackets              int    `description:"是否有方括号 1是 ，0 否"`
+	Label                   string `description:"主题标签"`
 }
 
 type GetCygxActivityListRep struct {

services/user.go

@@ -866,9 +866,7 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	defer func() {
 		os.Remove(downLoadnFilePath)
 	}()
-
-	fmt.Println(len(list2))
-	if len(list2) > 0 {
+	if len(list1) > 0 {
 		for _, v := range list1 {
 			item := new(models.WxUserWhite)
 			item.Mobile = v.Mobile