no message

controllers/home.go

@@ -649,7 +649,7 @@ func (this *HomeController) NewList() {
 	//conditionInit += `  AND source IN ('newchart')`
 	if user.CompanyId <= 1 || totalRai == 0 {
 		//condition += " AND source IN ('roadshow','article') "
-		condition += " AND source NOT IN ('activityspecial') "
+		condition += " AND source NOT IN ('activityspecial','industrialsourceHz','industrialsourceYx') "
 		listActivityYiDong, err := models.GetActivityListHomeNew("  AND art.yidong_activity_id != '' ", 0, 1000)
 		if err != nil {
 			br.Msg = "获取失败"
@@ -665,7 +665,7 @@ func (this *HomeController) NewList() {
 		condition += `  AND IF ( source = 'activity' , source_id  NOT IN (` + utils.GetOrmInReplace(lenyiDongactivityIds) + `) ,1=1 ) `
 		pars = append(pars, yiDongactivityIds)
 	} else {
-		condition += ` AND source NOT IN ('activity','activityspecial','newchart') ` + conditionInit
+		condition += ` AND source NOT IN ('activity','activityspecial','newchart','industrialsourceHz','industrialsourceYx') ` + conditionInit
 		//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0, 1)
 		conditionActivity, err := services.ActivityConditioninitSql(user, "", 0)
 		if err != nil && err.Error() != utils.ErrNoRow() {

utils/constants.go

@@ -231,20 +231,22 @@ const (
 )
 
 const (
-	CYGX_OBJ_ARTICLE            string = "article"            // 对象类型：文章
-	CYGX_OBJ_ACTIVITY           string = "activity"           // 对象类型：活动
-	CYGX_OBJ_ACTIVITYVIDEO      string = "activityvideo"      // 对象类型：活动视频
-	CYGX_OBJ_ACTIVITYVOICE      string = "activityvoice"      // 对象类型：活动音频
-	CYGX_OBJ_ACTIVITYSPECIAL    string = "activityspecial"    // 对象类型：专项调研活动
-	CYGX_OBJ_MEETINGREVIEWCHAPT string = "meetingreviewchapt" // 对象类型：晨会精华
-	CYGX_OBJ_ROADSHOW           string = "roadshow"           // 对象类型：路演
-	CYGX_OBJ_REPORTSELECTION    string = "reportselection"    // 对象类型：报告精选（重点公司）
-	CYGX_OBJ_PRODUCTINTERIOR    string = "productinterior"    // 对象类型：产品内测
-	CYGX_OBJ_RESEARCHSUMMARY    string = "researchsummary"    // 对象类型：本周研究汇总
-	CYGX_OBJ_MINUTESSUMMARY     string = "minutessummary"     // 对象类型：上周纪要汇总
-	CYGX_OBJ_YANXUANSPECIAL     string = "yanxuanspecial"     // 对象类型：研选专栏
-	CYGX_OBJ_ASKSERIEVIDEO      string = "askserievideo"      // 对象类型：问答系列视频
-	CYGX_OBJ_NEWCHART           string = "newchart"           // 对象类型：图表
+	CYGX_OBJ_ARTICLE             string = "article"            // 对象类型：文章
+	CYGX_OBJ_ACTIVITY            string = "activity"           // 对象类型：活动
+	CYGX_OBJ_ACTIVITYVIDEO       string = "activityvideo"      // 对象类型：活动视频
+	CYGX_OBJ_ACTIVITYVOICE       string = "activityvoice"      // 对象类型：活动音频
+	CYGX_OBJ_ACTIVITYSPECIAL     string = "activityspecial"    // 对象类型：专项调研活动
+	CYGX_OBJ_MEETINGREVIEWCHAPT  string = "meetingreviewchapt" // 对象类型：晨会精华
+	CYGX_OBJ_ROADSHOW            string = "roadshow"           // 对象类型：路演
+	CYGX_OBJ_REPORTSELECTION     string = "reportselection"    // 对象类型：报告精选（重点公司）
+	CYGX_OBJ_PRODUCTINTERIOR     string = "productinterior"    // 对象类型：产品内测
+	CYGX_OBJ_RESEARCHSUMMARY     string = "researchsummary"    // 对象类型：本周研究汇总
+	CYGX_OBJ_MINUTESSUMMARY      string = "minutessummary"     // 对象类型：上周纪要汇总
+	CYGX_OBJ_YANXUANSPECIAL      string = "yanxuanspecial"     // 对象类型：研选专栏
+	CYGX_OBJ_ASKSERIEVIDEO       string = "askserievideo"      // 对象类型：问答系列视频
+	CYGX_OBJ_NEWCHART            string = "newchart"           // 对象类型：图表
+	CYGX_OBJ_INDUSTRIALSOURCE_HZ string = "industrialsourceHz" // 对象类型：弘则资源包
+	CYGX_OBJ_INDUSTRIALSOURCE_YX string = "industrialsourceYx" // 对象类型：研选资源包
 )
 
 const (