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

entity/workDesktop.go

@@ -117,6 +117,11 @@ 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)
+		}
 		//菜单（移动端）是否需要显示:PC端菜单不需要在移动端显示；或移动端菜单不需要在PC端显示。
 		if menu.Url == "-1" {
 			continue
@@ -163,8 +168,8 @@ 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 == 3 {
+			logx.Info(mv.Children, "_________________________________________", mv.Name)
 		}
 		//if mv.Id < 466 {
 		//	continue
@@ -200,6 +205,9 @@ 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