|
|
@@ -4225,7 +4225,7 @@ func (this *ActivityCoAntroller) LabelTypeListV6Pc() {
|
|
|
whichDay = ""
|
|
|
}
|
|
|
if activeState == "undefined" || activeState == "" {
|
|
|
- activeState = "1"
|
|
|
+ activeState = "1,2"
|
|
|
}
|
|
|
userType, permissionStr, err := services.GetUserType(user.CompanyId)
|
|
|
if err != nil {
|
|
|
@@ -4338,7 +4338,7 @@ func (this *ActivityCoAntroller) LabelTypeListV6Pc() {
|
|
|
}
|
|
|
//标签字段关联的产业与标签处理
|
|
|
for k2, v2 := range labelList {
|
|
|
- labelList[k2].KeyWord = services.LabelStr(v2.KeyWord)
|
|
|
+ labelList[k2].KeyWord = services.LabelStrV5(v2.KeyWord, v2.IsShowSubjectName)
|
|
|
labelList[k2].Resource = 1
|
|
|
}
|
|
|
list[k].List = labelList
|
xingzai