|
@@ -76,7 +76,7 @@ func RenewWorkDesktopMenuModeOrCommonly(in *WorkDesktopComprehensiveReq) (r *Wor
|
|
|
default:
|
|
|
positionType = `AND available <= 2`
|
|
|
//P364 企业角色
|
|
|
- positionType += fmt.Sprintf(` AND FIND_IN_SET('%d',entrole) `, in.EntNicheDis)
|
|
|
+ positionType += fmt.Sprintf(` AND FIND_IN_SET('%d',entrole) `, in.EntNicheDis+1)
|
|
|
}
|
|
|
//常用功能存储是三级菜单id,需要四级菜单信息也查出来
|
|
|
//会出现 用户设置常用功能,此功能下线,用户设置依然保存的有此功能 查询不能加 AND status = 0
|
|
@@ -284,7 +284,7 @@ func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq) ([]*pb.MenuList, error)
|
|
|
PositionType: positionType, //职位类型 0:个人 1:企业
|
|
|
PositionId: positionId,
|
|
|
MgoUserId: in.MgoUserId,
|
|
|
- EntNicheDis: in.EntNicheDis,
|
|
|
+ EntNicheDis: in.EntNicheDis + 1,
|
|
|
}
|
|
|
logx.Info("--------wdm--MgoUserId-------:", wdm.MgoUserId)
|
|
|
//获取菜单树的数据
|