no message

controllers/cygx/activity.go

@@ -442,6 +442,7 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 			item.IsYidongConduct = req.IsYidongConduct
 			item.IsCanOutboundCall = req.IsCanOutboundCall
 			item.IsNeedEmail = isNeedEmail
+			item.AreaType = req.AreaType
 
 			if len(listImgToText) > 0 {
 				resultTime := utils.StrTimeToTime(item.ActivityTime)                                       //时间字符串格式转时间格式

controllers/cygx/tag_management.go

@@ -107,7 +107,7 @@ func (this *TagManagementController) TagCustomizeList() {
 		br.Ret = 408
 		return
 	}
-	searchType, _ := this.GetInt("SearchType", 1)
+	searchType, _ := this.GetInt("SearchType", -1)
 	var condition string
 	if searchType == 1 {
 		condition = " AND  tag_type = 0 "
@@ -564,8 +564,8 @@ func (this *TagManagementController) TagHotActivityList() {
 		condition += " AND art.activity_id IN  (" + conf.ConfigValue + ") "
 	} else {
 		condition += ` AND art.activity_name LIKE '%` + keyWord + `%'   `
-		condition += ` AND art.publish_status = 1  AND art.active_state  = 1 `
 	}
+	condition += ` AND art.publish_status = 1  AND art.active_state IN (1,2) `
 	list, err := cygx.GetActivityListAll(condition, pars, 0, 1000)
 	if err != nil {
 		br.Msg = "获取失败"

models/cygx/activity.go

@@ -91,6 +91,7 @@ type ActivityRep struct {
 	ListImgToText           []*AliyunOcrTextActivityResp `description:"识图建会的会议信息列表"`
 	BackgroundImg           string                       `description:"封面图片"`
 	ShareImg                string                       `description:"分享图片"`
+	AreaType                int                          `description:"地区，1国内，2海外，默认1"`
 }
 
 // 活动添加、修改入参
@@ -175,6 +176,7 @@ type ActivityDetail struct {
 	BackgroundImg             string                    `description:"封面图片"`
 	ShareImg                  string                    `description:"分享图片"`
 	TopTime                   int                       `description:"置顶时间"`
+	AreaType                  int                       `description:"地区，1国内，2海外，默认1"`
 }
 
 type ActivityDetailRep struct {
@@ -247,6 +249,7 @@ type CygxActivity struct {
 	ChartPermissionIdDeputy   int       `description:"行业id"`
 	ChartPermissionNameDeputy string    `description:"行业名称"`
 	CancelDeadline            string    `description:"取消报名截止时间"`
+	AreaType                  int       `description:"地区，1国内，2海外，默认1"`
 }
 
 type CygxActivityEditDetail struct {
@@ -419,6 +422,7 @@ func EditActivity(item *CygxActivity, oldPublishStatus int, industrialActivityIt
 	updateParams["ChartPermissionNameDeputy"] = item.ChartPermissionNameDeputy
 	updateParams["ChartPermissionIdDeputy"] = item.ChartPermissionIdDeputy
 	updateParams["CancelDeadline"] = item.CancelDeadline
+	updateParams["AreaType"] = item.AreaType
 	//修改活动信息
 	ptrStructOrTableName := "cygx_activity"
 	whereParam := map[string]interface{}{"activity_id": item.ActivityId}