wangshan 2 سال پیش
والد
کامیت
9864f76ac0
2فایلهای تغییر یافته به همراه7 افزوده شده و 17 حذف شده
  1. 3 3
      entity/user.go
  2. 4 14
      entity/workDesktop.go

+ 3 - 3
entity/user.go

@@ -78,7 +78,7 @@ func (m *WorkDesktopMenu) AutoUserPowerInfo() map[string]int {
 		PositionId:   m.PositionId,
 		MgoUserId:    m.MgoUserId,
 	}
-	logx.Info(m.MgoUserId, "------------------userInfoRpc-------------------------:", userInfoRpc)
+	logx.Info(m.MgoUserId, m.PositionId, "------------------userInfoRpc-------------------------:", userInfoRpc)
 	//权益中台获取权益
 	userPowers := userInfoRpc.GetUserPowers()
 	if userPowers != nil {
@@ -251,7 +251,7 @@ func (m *WorkDesktopMenu) AutoUserPowerInfo() map[string]int {
 			redis.PutBytes(RedisCode, userPowerRedisKey, &bytes, ConfigJson.InternalTime)
 		}
 	}
-	logx.Info("UserPowerMap:", UserPowerMap)
+	logx.Info(m.PositionId, "UserPowerMap:", UserPowerMap)
 	return UserPowerMap
 }
 
@@ -367,7 +367,7 @@ func CheckCapitalResources(menu *JYMenu, wd *WorkDesktopMenu, b, p bool) (title,
 		}
 	}
 	if menu.Id == 580 || menu.Id == 581 {
-		logx.Info(b, "-----", p, "----", menu.CapitalCode, capitalBool)
+		logx.Info(wd.PositionId, "--------------------------------", b, "-----", p, "----", menu.CapitalCode, capitalBool)
 	}
 	//无权限(医械通-:1:免费用户;2:超级订阅、大会员到期时间不在规定范围内)
 	if b {

+ 4 - 14
entity/workDesktop.go

@@ -117,7 +117,6 @@ 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)
@@ -168,9 +167,6 @@ 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 == 3 {
-			logx.Info(mv.Children, "_________________________________________", mv.Name)
-		}
 		//if mv.Id < 466 {
 		//	continue
 		//}
@@ -205,9 +201,6 @@ 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
@@ -239,9 +232,6 @@ 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 验证权限结果 无权限不显示
@@ -254,7 +244,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 						)
 
 						if tv.Id == 580 || tv.Id == 581 {
-							logx.Info(tv.Id, "---------------33333----------------------", tv.Name, usable, "=======================", m.VerifyPermissions(tv.PermissionCode))
+							logx.Info(m.PositionId, tv.Id, "---------------33333----------------------", tv.Name, usable, "=======================", m.VerifyPermissions(tv.PermissionCode))
 						}
 						//三级菜单------
 						if len(tv.Children) == 0 && (tv.CapitalCode != "" || tv.PermissionCode != "") {
@@ -319,9 +309,6 @@ 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
@@ -368,6 +355,9 @@ func (m *WorkDesktopMenu) VerifyPermissions(powerIds string) (b bool) {
 	}
 	if len(strings.Split(powerIds, ",")) > 0 {
 		userPower := m.AutoUserPowerInfo() //m.TimeOut, m.BigMemberOff,
+		if m.PositionId == 870425 {
+			logx.Info(powerIds, "---------------------------------------------", m.PositionId, "----------", userPower)
+		}
 		func(powerIds string) {
 			for _, pv := range strings.Split(powerIds, ",") {
 				if userPower[pv] > 0 {