|
|
@@ -2,11 +2,11 @@ package controllers
|
|
|
|
|
|
import (
|
|
|
"encoding/json"
|
|
|
+ "fmt"
|
|
|
"hongze/hongze_cygx/models"
|
|
|
"hongze/hongze_cygx/utils"
|
|
|
"rdluck_tools/paging"
|
|
|
"strconv"
|
|
|
- "strings"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
|
@@ -530,7 +530,7 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
|
|
|
isShowJurisdiction, _ := this.GetInt("IsShowJurisdiction")
|
|
|
//chartPermissionidsSlice := strings.Split(detail.ChartPermissionids, ",")
|
|
|
//activityTypeidsSlice := strings.Split(detail.ActivityTypeids, ",")
|
|
|
- activeStateSlice := strings.Split(detail.ActiveState, ",") //"活动进行状态 未开始：1、进行中2、已结束3"`
|
|
|
+ //activeStateSlice := strings.Split(detail.ActiveState, ",") //"活动进行状态 未开始：1、进行中2、已结束3"`
|
|
|
listActivityType, errActivityType := models.GetActivityTypeList()
|
|
|
if errActivityType != nil {
|
|
|
br.Msg = "获取失败"
|
|
|
@@ -582,13 +582,13 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
|
|
|
|
|
|
if detail.IsShowJurisdiction == 1 {
|
|
|
resp.IsShowJurisdiction = true
|
|
|
-
|
|
|
}
|
|
|
+ fmt.Println(isShowJurisdiction)
|
|
|
|
|
|
- if isShowJurisdiction == 1 {
|
|
|
+ if isShowJurisdiction == 1 || detail.IsShowJurisdiction == 1 {
|
|
|
resp.IsShowJurisdiction = true
|
|
|
- for k, _ := range listActivityType {
|
|
|
- listActivityType[k].IsChoose = true
|
|
|
+ for k, _ := range listChartPermissionid {
|
|
|
+ listChartPermissionid[k].IsChoose = true
|
|
|
}
|
|
|
}
|
|
|
if isShowJurisdiction == 2 {
|
xingzai