no message

controllers/cygx/activity.go

@@ -854,7 +854,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 	if isResearch {
 		chartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
 	} else {
-		//condition += ` AND art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'`
+		condition += ` AND art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'`
 	}
 	//行业名称
 	if chartPermissionId > 0 {
@@ -1198,10 +1198,10 @@ func (this *ActivityCoAntroller) PublishAndCancel() {
 		br.Msg = popupMsg
 		return
 	}
-	if activityInfo.ActiveState != 1 {
-		br.Msg = "活动已经开始，无法修改"
-		return
-	}
+	//if activityInfo.ActiveState != 1 {
+	//	br.Msg = "活动已经开始，无法修改"
+	//	return
+	//}
 	if activityInfo.PublishStatus == 0 {
 		item.PublishStatus = 1
 		item.IsCancel = 0

controllers/cygx/activity_meet.go

@@ -87,7 +87,7 @@ func (this *ActivityMeetCoAntroller) MeetList() {
 	if isResearch {
 		chartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
 	} else {
-		//condition += ` AND art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'`
+		condition += ` AND art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'`
 	}
 	//行业名称
 	if chartPermissionId > 0 {

controllers/cygx/activity_signup.go

@@ -103,7 +103,7 @@ func (this *ActivitySignupCoAntroller) SignupList() {
 	if isResearch {
 		chartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
 	} else {
-		//condition += ` AND art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'`
+		condition += ` AND art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'`
 	}
 	//行业名称
 	if chartPermissionId > 0 {

models/cygx/activity.go

@@ -163,6 +163,7 @@ type ActivityDetail struct {
 	IsNeedEmail             int                       `description:"是否需要提供邮箱 1是，0否"`
 	SiginupDeadline         string                    `description:"报名截止时间"`
 	PointsSet               *CygxActivityPointsSetRsq `description:"研选扣点明细"`
+	IsShowHz                int                       `description:"是否同时在弘则展示  1是，0否"`
 }
 
 type ActivityDetailRep struct {