|
@@ -117,7 +117,6 @@ func (m *WorkDesktopMenu) GetMenuTreeData() error {
|
|
|
default:
|
|
|
menu.Url = MC.ObjToString(v["pcurl"])
|
|
|
}
|
|
|
- logx.Info("++++00000000000000000000000000000++++", menu.Id)
|
|
|
if menu.Id == 580 || menu.Id == 581 {
|
|
|
logx.Info("v::::::::::::", v)
|
|
|
logx.Info(menu.Name, "+++++++++++++++++++++", menu.Url, menu.PowerIds)
|
|
@@ -168,9 +167,6 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
//logx.Info("树的长度:", len(m.MenuTree))
|
|
|
menuList := make([]*pb.MenuList, 0)
|
|
|
for _, mv := range m.MenuTree {
|
|
|
- if mv.Id == 3 {
|
|
|
- logx.Info(mv.Children, "_________________________________________", mv.Name)
|
|
|
- }
|
|
|
//if mv.Id < 466 {
|
|
|
// continue
|
|
|
//}
|
|
@@ -205,9 +201,6 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
for _, sv := range mv.Children {
|
|
|
//0:默认展示;1:需验证权限,有权限展示;2:需验证权限,无权限也可展示(可用服务无权限不展示)
|
|
|
usable := m.VerifyPermissions(sv.PowerIds)
|
|
|
- if sv.Id == 21 {
|
|
|
- logx.Info(sv.Id, "-------------------------------------", sv.Name)
|
|
|
- }
|
|
|
//checkCode==1 验证权限结果 无权限不显示
|
|
|
if !usable && sv.CheckCode == 1 {
|
|
|
continue
|
|
@@ -239,9 +232,6 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
if (strings.Contains(tv.Name, "附件下载包") && m.VerifyPermissions("3")) || (tv.Name == "采购单位画像记录" && m.VerifyPermissions("5")) || (tv.Name == "企业画像记录" && m.VerifyPermissions("4,12,13,19,20,21,23")) {
|
|
|
continue
|
|
|
}
|
|
|
- if tv.Id == 580 || tv.Id == 581 {
|
|
|
- logx.Info(tv.Id, "--------------22222222222-----------------------", tv.Name, tv.PowerIds)
|
|
|
- }
|
|
|
//0:默认展示;1:需验证权限,有权限展示;2:需验证权限,无权限也可展示(可用服务无权限不展示)
|
|
|
usable := m.VerifyPermissions(tv.PowerIds)
|
|
|
//checkCode==1 验证权限结果 无权限不显示
|
|
@@ -254,7 +244,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
)
|
|
|
|
|
|
if tv.Id == 580 || tv.Id == 581 {
|
|
|
- logx.Info(tv.Id, "---------------33333----------------------", tv.Name, usable, "=======================", m.VerifyPermissions(tv.PermissionCode))
|
|
|
+ logx.Info(m.PositionId, tv.Id, "---------------33333----------------------", tv.Name, usable, "=======================", m.VerifyPermissions(tv.PermissionCode))
|
|
|
}
|
|
|
//三级菜单------
|
|
|
if len(tv.Children) == 0 && (tv.CapitalCode != "" || tv.PermissionCode != "") {
|
|
@@ -319,9 +309,6 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if tv.Id == 580 || tv.Id == 581 {
|
|
|
- logx.Info(feasibility, "---------------4444444----------------------", tv.Name, tv.CheckCode)
|
|
|
- }
|
|
|
//无资源中台权限 菜单不显示
|
|
|
if !feasibility && tv.CheckCode == 1 {
|
|
|
continue
|
|
@@ -368,6 +355,9 @@ func (m *WorkDesktopMenu) VerifyPermissions(powerIds string) (b bool) {
|
|
|
}
|
|
|
if len(strings.Split(powerIds, ",")) > 0 {
|
|
|
userPower := m.AutoUserPowerInfo() //m.TimeOut, m.BigMemberOff,
|
|
|
+ if m.PositionId == 870425 {
|
|
|
+ logx.Info(powerIds, "---------------------------------------------", m.PositionId, "----------", userPower)
|
|
|
+ }
|
|
|
func(powerIds string) {
|
|
|
for _, pv := range strings.Split(powerIds, ",") {
|
|
|
if userPower[pv] > 0 {
|