Merge branch 'feature/v1.2.20_ws' of BaseService/userCenter into feature/v1.2.20

entity/workDesktop.go

@@ -328,14 +328,14 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 					}
 				}
 				//二级菜单  有三级子菜单；才会显示
-				if len(secondLevel.Child) == 0 { //&& sv.CheckCode == 1
+				if len(secondLevel.Child) == 0 && sv.CheckCode == 1 {
 					continue
 				}
 				oneLevel.Child = append(oneLevel.Child, secondLevel)
 			}
 		}
 		//一级菜单  有二级子菜单；才会显示
-		if len(oneLevel.Child) == 0 { //&& mv.CheckCode == 1
+		if len(oneLevel.Child) == 0 && mv.CheckCode == 1 {
 			continue
 		}
 		menuList = append(menuList, oneLevel)