no message

controllers/cygx/industrial_management.go

@@ -100,7 +100,7 @@ func (this *IndustrialManagementController) ChartPermissionListIco() {
 	havestrategy, _ := this.GetInt("Havestrategy")
 	var condition string
 	if havestrategy > 0 {
-		condition = ` AND chart_permission_id IN (19,20,21,22,23) `
+		condition = ` AND chart_permission_id IN (19,20,21,22,23,31) `
 	} else {
 		condition = ` AND chart_permission_id IN (19,20,21,22) `
 	}

controllers/cygx/rai_serve.go

@@ -168,7 +168,7 @@ func (this *RaiServeCoAntroller) SearchTagCalendar() {
 			hasCelue = true
 		}
 	}
-
+	permissionName = append(permissionName, utils.ZHOU_QI_NAME) //所有行业默认添加周期行业
 	var permissionNameSql []string
 	for _, v := range permissionName {
 		permissionNameSql = append(permissionNameSql, "'"+v+"'")

models/roadshow/company.go

@@ -39,7 +39,10 @@ func CompanySearchV2(sellerId, groupId int, keyWord string) (list []*CompanySear
 				company AS a
 			INNER JOIN company_product AS b ON a.company_id = b.company_id 
 			WHERE
-				b.status IN ('正式', '试用', '永续') AND (b.seller_id = ? OR b.share_seller_id = ?  OR b.group_id = ? OR b.share_group_id = ?  ) AND a.company_name LIKE ?
+			     1=1 
+			     AND IF  ( b.product_id = 1 , b.status IN ('正式', '试用', '永续') ,1=1 )  
+			     AND IF  ( b.product_id = 2 , b.status IN ('正式', '试用', '永续', '冻结', '流失') ,1=1 )  
+				 AND (b.seller_id = ? OR b.share_seller_id = ?  OR b.group_id = ? OR b.share_group_id = ?  ) AND a.company_name LIKE ?
 			GROUP BY
 				b.company_id `
 	_, err = o.Raw(sql, sellerId, sellerId, groupId, groupId, keyWord).QueryRows(&companies)