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

entity/user.go

@@ -251,6 +251,7 @@ func (m *WorkDesktopMenu) AutoUserPowerInfo() map[string]int {
 			redis.PutBytes(RedisCode, userPowerRedisKey, &bytes, ConfigJson.InternalTime)
 		}
 	}
+	logx.Info("UserPowerMap:", UserPowerMap)
 	return UserPowerMap
 }
 
@@ -365,6 +366,9 @@ func CheckCapitalResources(menu *JYMenu, wd *WorkDesktopMenu, b, p bool) (title,
 			}
 		}
 	}
+	if menu.Id == 580 || menu.Id == 581 {
+		logx.Info(b, "-----", p, "----", menu.CapitalCode, capitalBool)
+	}
 	//无权限（医械通-：1：免费用户；2：超级订阅、大会员到期时间不在规定范围内）
 	if b {
 		//资源中台--- 无权限弹窗信息为默认信息（先留资）

entity/workDesktop.go

@@ -254,7 +254,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 						)
 
 						if tv.Id == 580 || tv.Id == 581 {
-							logx.Info(tv.Id, "---------------33333----------------------", tv.Name)
+							logx.Info(tv.Id, "---------------33333----------------------", tv.Name, usable, "=======================", m.VerifyPermissions(tv.PermissionCode))
 						}
 						//三级菜单------
 						if len(tv.Children) == 0 && (tv.CapitalCode != "" || tv.PermissionCode != "") {