|
@@ -1242,7 +1242,7 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
|
|
|
br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- resp.ListChartPermission2 = list2
|
|
|
+
|
|
|
if activeStateList[1].IsChoose == activeStateList[2].IsChoose == false {
|
|
|
activeStateList[0].IsChoose = true
|
|
|
}
|
|
@@ -1253,6 +1253,17 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
|
|
|
br.ErrMsg = "获取失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+ var listChartPermissionidNew2 []*models.ActivityChartPermission
|
|
|
+ for _, v := range list2 {
|
|
|
+ if userType == 1 {
|
|
|
+ if v.PermissionName != "研选" {
|
|
|
+ listChartPermissionidNew2 = append(listChartPermissionidNew2, v)
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ listChartPermissionidNew2 = append(listChartPermissionidNew2, v)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ resp.ListChartPermission2 = listChartPermissionidNew2
|
|
|
var listChartPermissionidNew []*models.ActivityChartPermission
|
|
|
for _, v := range listChartPermissionid {
|
|
|
if userType == 1 {
|