|
@@ -8,6 +8,7 @@ import (
|
|
|
"encoding/json"
|
|
|
"errors"
|
|
|
"github.com/zeromicro/go-zero/core/logx"
|
|
|
+ "log"
|
|
|
"sort"
|
|
|
"strconv"
|
|
|
"strings"
|
|
@@ -87,6 +88,9 @@ func (m *WorkDesktopMenu) GetMenuTreeData() error {
|
|
|
CapitalCode: MC.ObjToString(v["capitalcode"]),
|
|
|
Authority: MC.IntAll(v["authority"]),
|
|
|
}
|
|
|
+ if menu.Name == "企业情报监控" {
|
|
|
+ log.Println("+++++++")
|
|
|
+ }
|
|
|
var OpenType = map[string]string{}
|
|
|
if err := json.Unmarshal([]byte(MC.ObjToString(v["opentype"])), &OpenType); err == nil {
|
|
|
menu.OpenType = OpenType[m.Platform]
|
|
@@ -280,7 +284,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
threeLevel.Match = MC.If(fv.Match != "", strings.Split(fv.Match, ","), []string{}).([]string)
|
|
|
//四级菜单必须有顺序性,大会员》商机管理》超级订阅》免费用户
|
|
|
name := MC.If(strings.Contains(fv.Name, "-"), strings.Split(fv.Name, "-")[0], "免费").(string)
|
|
|
- if len(UserRolePowers[name]) > 0 && m.VerifyPermissions(strings.Join(UserRolePowers[name], ",")) {
|
|
|
+ if len(UserRolePowers[name]) > 0 && m.VerifyPermissions(strings.Join(UserRolePowers[name], ",")) && m.VerifyPermissions(fv.PowerIds) {
|
|
|
break L
|
|
|
}
|
|
|
}
|