Merge branch 'cygx_8.7' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -4710,6 +4710,7 @@ func (this *ActivityCoAntroller) OverActivityList() {
 	//var startSize, pageSize int
 	//pageSize = 24
 	var condition string
+	var conditionSpecial string
 	var sortTime string
 	//var conditionStatus string
 	var pars []interface{}
@@ -4826,6 +4827,10 @@ func (this *ActivityCoAntroller) OverActivityList() {
 		}
 		condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
 		condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
+
+		conditionSpecial += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
+		conditionSpecial += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
+
 	}
 	if len(chartPermissionIds) > 0 {
 		condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
@@ -4852,7 +4857,7 @@ func (this *ActivityCoAntroller) OverActivityList() {
 	sortTime = ` activity_time DESC `
 
 	//如果是永续的就按照普通的权限逻辑来查，如果不是就按照升级的逻辑来查
-	var conditionSpecial string
+
 	companyDetail, err := models.GetCompanyDetailByIdGroupTrip(user.CompanyId)
 	if err != nil {
 		br.Msg = "获取失败"

controllers/user.go

@@ -296,7 +296,7 @@ func (this *UserController) Detail() {
 					}
 					mapPermissionName[v.PermissionName] = v.PermissionName
 				}
-				permissionStr = strings.TrimLeft(permissionStr, ",")
+				permissionStr = strings.TrimRight(permissionStr, ",")
 				//permissionStrOld, err := models.GetCompanyPermission(companyItem.CompanyId)
 				//if err != nil {
 				//	br.Msg = "获取信息失败"

services/activity.go

@@ -1566,7 +1566,7 @@ func GetActivityNewLabelMap(activityIds []int) (labelMap map[int]bool, industryN
 	// 获取活动关联的产业
 	var groupCond string
 	var groupPars []interface{}
-	groupCond += ` AND a.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `)`
+	groupCond += ` AND a.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `) AND b.source = 1 `
 	groupPars = append(groupPars, activityIds)
 	groups, e := models.GetActivityIndustryRelationList(groupCond, groupPars)
 	if e != nil {
@@ -1599,6 +1599,11 @@ func GetActivityNewLabelMap(activityIds []int) (labelMap map[int]bool, industryN
 			}
 		}
 	}
+	//产业关联的弘则报告发布日期在三个月以内的活动、产业显示 NEW标签
+	articNewLabel, e := GetArticNewLabelWhithActivity3Month()
+	for k := range articNewLabel {
+		labelMap[k] = true
+	}
 
 	return
 }

services/article.go

@@ -1595,8 +1595,12 @@ func GetSpecialArticleDetailUserPower(user *models.WxUserItem, articleInfo *mode
 	return
 }
 
+func init() {
+	GetArticNewLabelWhithActivity3Month()
+}
+
 //弘则报告发布日期在三个月以内的
-func GetArticNewLabel3Month() (labelMap map[int]bool, err error) {
+func GetArticNewLabelWhithActivity3Month() (labelMap map[int]bool, err error) {
 	var condition string
 	var pars []interface{}
 	condition += ` AND publish_date  >= ? `
@@ -1623,8 +1627,25 @@ func GetArticNewLabel3Month() (labelMap map[int]bool, err error) {
 		return
 	}
 	labelMap = make(map[int]bool, 0)
+	var industrialIds []int
 	for _, v := range industrialList {
-		labelMap[v.IndustrialManagementId] = true
+		industrialIds = append(industrialIds, v.IndustrialManagementId)
+	}
+
+	// 获取活动关联的产业
+	var groupCond string
+	var groupPars []interface{}
+	groupCond += ` AND b.industrial_management_id IN (` + utils.GetOrmInReplace(len(industrialIds)) + `)  AND b.source = 1  `
+	groupPars = append(groupPars, industrialIds)
+	groups, e := models.GetActivityIndustryRelationList(groupCond, groupPars)
+	if e != nil {
+		err = errors.New("获取活动产业关联列表失败, Err: " + e.Error())
+		return
 	}
+	for _, v := range groups {
+		labelMap[v.ActivityId] = true
+	}
+
+	fmt.Println(labelMap[89])
 	return
 }