|
|
@@ -149,21 +149,21 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
continue
|
|
|
}
|
|
|
var (
|
|
|
- title, content, confirmUrl, confirmText, isShowCancel, appType, openType = tv.AdditionalInfo.Title, tv.AdditionalInfo.Content, tv.AdditionalInfo.ConfirmUrl, tv.AdditionalInfo.ConfirmText, tv.AdditionalInfo.IsShowCancel, tv.AdditionalInfo.AppType, tv.AdditionalInfo.OpenType
|
|
|
+ title, content, confirmUrl, confirmText, isShowCancel, appType, openType, feasibility = tv.AdditionalInfo.Title, tv.AdditionalInfo.Content, tv.AdditionalInfo.ConfirmUrl, tv.AdditionalInfo.ConfirmText, tv.AdditionalInfo.IsShowCancel, tv.AdditionalInfo.AppType, tv.AdditionalInfo.OpenType, usable
|
|
|
)
|
|
|
//三级菜单------
|
|
|
if len(tv.Children) == 0 && (tv.CapitalCode != "" || tv.PermissionCode != "") {
|
|
|
//用户是否需要留资
|
|
|
//资源中台获取用户权限--没有权限：title等置空
|
|
|
//ResourceLib.PowerHandle()
|
|
|
- title, content, confirmUrl, confirmText, appType, openType, isShowCancel, usable = CheckCapitalResources(tv, m.NewUserId, m.AppId, m.EntId, m.EntUserId, usable)
|
|
|
+ title, content, confirmUrl, confirmText, appType, openType, isShowCancel, feasibility = CheckCapitalResources(tv, m.NewUserId, m.AppId, m.EntId, m.EntUserId, usable)
|
|
|
}
|
|
|
threeLevel := &pb.ThreeLevelMenu{
|
|
|
Name: tv.Name,
|
|
|
Icon: tv.Icon,
|
|
|
Url: tv.Url,
|
|
|
Id: encrypt.SE.EncodeString(strconv.Itoa(tv.Id)), //功能id加密
|
|
|
- Usable: usable, //MC.If(tv.PowerIds != "", usable && tv.CheckCode == 1, true).(bool),
|
|
|
+ Usable: feasibility, //MC.If(tv.PowerIds != "", usable && tv.CheckCode == 1, true).(bool),
|
|
|
AppType: tv.AppType,
|
|
|
OpenType: tv.OpenType,
|
|
|
TipInfo: &pb.TipInfo{
|
|
|
@@ -187,13 +187,13 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
|
|
|
//用户是否需要留资
|
|
|
//资源中台获取用户权限--没有权限：title等置空
|
|
|
//ResourceLib.PowerHandle()
|
|
|
- title, content, confirmUrl, confirmText, appType, openType, isShowCancel, usable = CheckCapitalResources(fv, m.NewUserId, m.AppId, m.EntId, m.EntUserId, usable)
|
|
|
+ title, content, confirmUrl, confirmText, appType, openType, isShowCancel, feasibility = CheckCapitalResources(fv, m.NewUserId, m.AppId, m.EntId, m.EntUserId, usable)
|
|
|
}
|
|
|
threeLevel.Url = MC.If(fv.Url != "", fv.Url, tv.Url).(string)
|
|
|
threeLevel.Icon = MC.If(fv.Icon != "", fv.Icon, tv.Icon).(string)
|
|
|
threeLevel.AppType = fv.AppType
|
|
|
threeLevel.OpenType = fv.OpenType
|
|
|
- threeLevel.Usable = usable
|
|
|
+ threeLevel.Usable = feasibility
|
|
|
if fv.AdditionalInfo.Title != "" {
|
|
|
threeLevel.TipInfo = &pb.TipInfo{
|
|
|
Title: title,
|
