Merge branch 'dev/1.2.16_ws' of BaseService/userCenter into feature/v1.2.16

entity/workDesktop.go

@@ -163,6 +163,9 @@ 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 == 21 {
+			logx.Info(mv.Id, "-------------------------------------", mv.Name)
+		}
 		//if mv.Id < 466 {
 		//	continue
 		//}
@@ -228,6 +231,9 @@ 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 验证权限结果 无权限不显示
@@ -238,6 +244,10 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 							//数据库默认提示弹窗信息
 							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 tv.Id == 580 || tv.Id == 581 {
+							logx.Info(tv.Id, "---------------33333----------------------", tv.Name)
+						}
 						//三级菜单------
 						if len(tv.Children) == 0 && (tv.CapitalCode != "" || tv.PermissionCode != "") {
 							//用户是否需要留资
@@ -301,6 +311,9 @@ 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