|
@@ -80,9 +80,14 @@ func RenewWorkDesktopMenuModeOrCommonly(in *WorkDesktopComprehensiveReq) (r *Wor
|
|
}
|
|
}
|
|
childMenus = map[int][]*entity.JYMenu{}
|
|
childMenus = map[int][]*entity.JYMenu{}
|
|
)
|
|
)
|
|
|
|
+ //是否存在父级
|
|
|
|
+ parentIsExists := map[int]bool{}
|
|
for _, mv := range *menuData {
|
|
for _, mv := range *menuData {
|
|
|
|
+ //id
|
|
|
|
+ id := MC.IntAll(mv["id"])
|
|
//parentId
|
|
//parentId
|
|
parentId := MC.IntAll(mv["parentid"])
|
|
parentId := MC.IntAll(mv["parentid"])
|
|
|
|
+ parentIsExists[id] = true
|
|
menu := &entity.JYMenu{
|
|
menu := &entity.JYMenu{
|
|
Id: MC.IntAll(mv["id"]),
|
|
Id: MC.IntAll(mv["id"]),
|
|
Name: MC.ObjToString(mv["name"]),
|
|
Name: MC.ObjToString(mv["name"]),
|
|
@@ -120,10 +125,19 @@ func RenewWorkDesktopMenuModeOrCommonly(in *WorkDesktopComprehensiveReq) (r *Wor
|
|
menu.AdditionalInfo = additional
|
|
menu.AdditionalInfo = additional
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if menu.Level == 4 {
|
|
|
|
- childMenus[parentId] = append(childMenus[parentId], menu)
|
|
|
|
|
|
+ //外网不一致,
|
|
|
|
+ if "work_menu" == entity.ConfigJson.WorkTableOut {
|
|
|
|
+ if parentIsExists[parentId] {
|
|
|
|
+ childMenus[parentId] = append(childMenus[parentId], menu)
|
|
|
|
+ } else {
|
|
|
|
+ m.MenuTree = append(m.MenuTree, menu)
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
- m.MenuTree = append(m.MenuTree, menu)
|
|
|
|
|
|
+ if menu.Level == 4 {
|
|
|
|
+ childMenus[parentId] = append(childMenus[parentId], menu)
|
|
|
|
+ } else {
|
|
|
|
+ m.MenuTree = append(m.MenuTree, menu)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//常用功能格式化
|
|
//常用功能格式化
|