no message

services/activity.go

@@ -317,6 +317,11 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 // 根据用户身份处理活动可见
 func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower int) (conditionActivity string, err error) {
 	condition += "  AND  IF ( art.is_limit_people  = 1 ,  art.customer_type_ids != '' ,1=1  )  "
+	//未登录的用户也可以查看所有活动v12.2.1
+	if user.UserId == 0 {
+		conditionActivity = ` AND art.publish_status = 1   AND art.yidong_activity_id = ''  ` + condition
+		return
+	}
 	// cygx_10.9 未绑定联系方式的客户可以看到部分活动
 	if user.UserId == 0 || user.CompanyId == 1 {
 		conditionActivity = ` AND art.publish_status = 1  AND art.visible_range != 1 AND (art.is_limit_people = 0 OR (art.is_limit_people=1 AND art.is_all_customer_type=1))   ` + condition
@@ -325,15 +330,13 @@ func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower
 	condition += `   AND art.publish_status = 1 `
 	conditionActivity = condition
 	//弘则可以查看所有活动
-	if GetBelongingRaiIt(user.Mobile) && user.CompanyId == utils.HZ_COMPANY_ID {
+	if (GetBelongingRai(user.Mobile) && user.CompanyId == utils.HZ_COMPANY_ID) || user.UserId == 0 {
+		return
+	}
+	adminIds, err := models.GetSelleridWhichGroup(user.CompanyId, 2)
+	if err != nil {
 		return
 	}
-	//adminIds, err := models.GetSelleridWhichGroup(user.CompanyId, 2)
-	//if err != nil {
-	//	return
-	//}
-
-	adminIds := GetSelleridWhichGroup(user.CompanyId, 2, user.Mobile)
 	userType, permissionStr, permissionStrZhengShi, err := GetUserTypeZhengShi(user.CompanyId)
 	if err != nil {
 		return
@@ -383,7 +386,7 @@ func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower
 	}
 	var userTypeStr string
 	userTypeStr = mapUserType[userType]
-	fmt.Println("userTypeStr", userTypeStr)
+
 	// 查研观向7.4-始终查询宏观的权限(无论是否有权限)
 	if permissionNameStr == `` {
 		permissionNameStr = `'宏观'`
@@ -435,28 +438,9 @@ func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower
 		}
 	}
 
-	conditionShengji, conditionZhengshi, conditionHangYe, e := ActivityLabelSpecialUserSql(user)
-	if e != nil {
-		err = errors.New("ActivityLabelSpecialUserSql, Err: " + e.Error())
-		return
-	}
-	// 升级客户可查看范围
-	if conditionShengji != "" {
-		conditionOr += ` OR (  art.is_limit_people = 1 AND ` + conditionShengji + condition + ` ) `
-	}
-	// 正式客户可查看范围
-	if conditionZhengshi != "" {
-		conditionOr += ` OR (  art.is_limit_people = 1 AND ` + conditionZhengshi + condition + ` ) `
-	}
-	// 行业客户可查看范围
-	if conditionHangYe != "" {
-		conditionOr += ` OR (  art.is_limit_people = 1 AND ` + conditionHangYe + condition + ` ) `
-	}
-
 	//if userType == 3 {
 	//	condition += `  AND art.chart_permission_name  IN (` + permissionNameStrZhengShi + `) `
 	//}
-
 	condition += `    AND  art.is_limit_people = 1  `
 	conditionActivity = condition + permissionSqlStr + sqlExport + conditionOr
 	return

services/resource_data.go

@@ -17,6 +17,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		err = errors.New("GetResourceDataList, Err: " + e.Error())
 		return
 	}
+
 	mapItems := make(map[string]*models.CygxResourceDataNewResp)
 	for _, v := range list {
 		//预处理文章
@@ -31,28 +32,17 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		mapItems[fmt.Sprint(v.Source, v.SourceId)] = item
 	}
 
-	var articleIds []int            //报告
-	var newchartIds []int           //图表
-	var roadshowIds []string        //微路演
-	var activityIds []int           //活动
-	var activityvideoIds []string   // 活动视频
-	var activityvoiceIds []string   //活动音频
-	var activityspecialIds []int    //专项调研活动
-	var researchsummaryIds []int    //本周研究汇总
-	var minutessummaryIds []int     //上周纪要汇总
-	var meetingreviewchaptIds []int //晨会精华
-	var productinteriorIds []int    //产品内测
-	var reportselectionIds []int    // 报告精选
-	var yanxuanSpecialIds []int     // 研选专栏
-	var askserieVideoIds []string   //问答系列视频
+	var articleIds []int          //报告
+	var activityIds []int         //活动
+	var activityvideoIds []string // 活动视频
+	var activityvoiceIds []string //活动音频
+	var activityspecialIds []int  //专项调研活动
+	var reportselectionIds []int  // 报告精选
+	var yanxuanSpecialIds []int   // 研选专栏
 	//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial 、 本周研究汇总： researchsummary 、 上周纪要汇总 ：minutessummary 、晨会精华 ：meetingreviewchapt  、 产品内测：productinterior
 	for _, v := range list {
 		if v.Source == "article" {
 			articleIds = append(articleIds, v.SourceId)
-		} else if v.Source == "newchart" {
-			newchartIds = append(newchartIds, v.SourceId)
-		} else if v.Source == "roadshow" {
-			roadshowIds = append(roadshowIds, strconv.Itoa(v.SourceId))
 		} else if v.Source == "activity" {
 			activityIds = append(activityIds, v.SourceId)
 		} else if v.Source == "activityvideo" {
@@ -61,20 +51,10 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			activityvoiceIds = append(activityvoiceIds, strconv.Itoa(v.SourceId))
 		} else if v.Source == "activityspecial" {
 			activityspecialIds = append(activityspecialIds, v.SourceId)
-		} else if v.Source == "researchsummary" {
-			researchsummaryIds = append(researchsummaryIds, v.SourceId)
-		} else if v.Source == "minutessummary" {
-			minutessummaryIds = append(minutessummaryIds, v.SourceId)
-		} else if v.Source == "meetingreviewchapt" {
-			meetingreviewchaptIds = append(meetingreviewchaptIds, v.SourceId)
-		} else if v.Source == "productinterior" {
-			productinteriorIds = append(productinteriorIds, v.SourceId)
 		} else if v.Source == "reportselection" {
 			reportselectionIds = append(reportselectionIds, v.SourceId)
 		} else if v.Source == utils.CYGX_OBJ_YANXUANSPECIAL {
 			yanxuanSpecialIds = append(yanxuanSpecialIds, v.SourceId)
-		} else if v.Source == utils.CYGX_OBJ_ASKSERIEVIDEO {
-			askserieVideoIds = append(askserieVideoIds, strconv.Itoa(v.SourceId))
 		}
 
 	}
@@ -177,94 +157,6 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		}
 	}
 
-	if len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds)+len(askserieVideoIds) > 0 {
-
-		audioIdstr := strings.Join(activityvoiceIds, ",")
-		activityVideoIdsStr := strings.Join(activityvideoIds, ",")
-		roadshowIdsStr := strings.Join(roadshowIds, ",")
-		askserieVideoIdsStr := strings.Join(askserieVideoIds, ",")
-
-		list, _, e := GetMicroRoadShowMycollectV12(len(roadshowIds)+len(activityvideoIds)+len(activityvoiceIds)+len(askserieVideoIds), 0, audioIdstr, activityVideoIdsStr, roadshowIdsStr, askserieVideoIdsStr, user)
-		if e != nil {
-			err = errors.New("GetMicroRoadShowMycollect, Err: " + e.Error())
-			return
-		}
-		// 用户权限
-		authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
-		if e != nil {
-			err = errors.New("GetUserRaiPermissionInfo, Err: " + e.Error())
-			return
-		}
-
-		// 获取默认图配置
-		audioMap, videoMap, audioShareMap, videoShareMap, e := GetMicroRoadShowDefaultImgConfig()
-		if e != nil {
-			err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
-			return
-		}
-		//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
-		for i := range list {
-			// 权限
-			au := new(models.UserPermissionAuthInfo)
-			au.SellerName = authInfo.SellerName
-			au.SellerMobile = authInfo.SellerMobile
-			au.HasPermission = authInfo.HasPermission
-			au.OperationMode = authInfo.OperationMode
-			if au.HasPermission == 1 {
-				// 非宏观权限进一步判断是否有权限
-				if list[i].ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, list[i].ChartPermissionName) {
-					au.HasPermission = 2
-				}
-			}
-			// 无权限的弹框提示
-			if au.HasPermission != 1 {
-				if au.OperationMode == UserPermissionOperationModeCall {
-					if list[i].Type == 1 {
-						au.PopupMsg = UserPermissionPopupMsgCallActivity
-					} else {
-						au.PopupMsg = UserPermissionPopupMsgCallMicroVideo
-					}
-				} else {
-					if list[i].Type == 1 {
-						au.PopupMsg = UserPermissionPopupMsgApplyActivity
-					} else {
-						au.PopupMsg = UserPermissionPopupMsgApplyMicroVideo
-					}
-				}
-			}
-			list[i].AuthInfo = au
-			list[i].PublishTime = utils.StrTimeToTime(list[i].PublishTime).Format(utils.FormatDate)
-			// 默认图
-			if list[i].BackgroundImg == "" {
-				if list[i].Type == 1 {
-					list[i].BackgroundImg = audioMap[list[i].ChartPermissionId]
-				} else {
-					list[i].BackgroundImg = videoMap[list[i].ChartPermissionId]
-				}
-			}
-			// 分享图
-			if list[i].ShareImg == "" {
-				if list[i].Type == 1 {
-					list[i].ShareImg = audioShareMap[list[i].ChartPermissionId]
-				} else {
-					list[i].ShareImg = videoShareMap[list[i].ChartPermissionId]
-				}
-			}
-		}
-		//Type                int    `description:"类型: 1-音频; 2-活动视频； 3-产业视频"`
-		for _, item := range list {
-			if item.Type == 1 {
-				mapItems[fmt.Sprint("activityvoice", item.Id)].Activityvoice = item
-			} else if item.Type == 2 {
-				mapItems[fmt.Sprint("activityvideo", item.Id)].Activityvideo = item
-			} else if item.Type == 3 {
-				mapItems[fmt.Sprint("roadshow", item.Id)].Roadshow = item
-			} else if item.Type == 4 {
-				mapItems[fmt.Sprint(utils.CYGX_OBJ_ASKSERIEVIDEO, item.Id)].AskserieVideo = item
-			}
-		}
-	}
-
 	//处理研选专栏
 	lenyanxuanSpecialIds := len(yanxuanSpecialIds)
 	if lenyanxuanSpecialIds > 0 {