|
@@ -180,16 +180,13 @@ func GetWorkDesktopMenuMode(in *WorkDesktopMenuInfoReq) (str string, err error)
|
|
|
|
|
|
// GetWordDesktopMenuTree 获取工作桌面菜单树
|
|
// GetWordDesktopMenuTree 获取工作桌面菜单树
|
|
func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq) ([]*pb.MenuList, error) {
|
|
func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq) ([]*pb.MenuList, error) {
|
|
- logx.Info("in:", in)
|
|
|
|
if in.EntId > 0 {
|
|
if in.EntId > 0 {
|
|
//判断商机管理用户是否切换企业
|
|
//判断商机管理用户是否切换企业
|
|
userEntIdKey := fmt.Sprintf(entity.UserEntIdKey, in.AppId, time.Now().Day(), in.UserId)
|
|
userEntIdKey := fmt.Sprintf(entity.UserEntIdKey, in.AppId, time.Now().Day(), in.UserId)
|
|
redisEntid := redis.GetInt(entity.RedisCode, userEntIdKey)
|
|
redisEntid := redis.GetInt(entity.RedisCode, userEntIdKey)
|
|
- logx.Info(redisEntid, "----EntId:", in.EntId)
|
|
|
|
if int64(redisEntid) > 0 && int64(redisEntid) != in.EntId {
|
|
if int64(redisEntid) > 0 && int64(redisEntid) != in.EntId {
|
|
//商机管理用户切换企业---清除用户权限缓存&&清除用户菜单缓存
|
|
//商机管理用户切换企业---清除用户权限缓存&&清除用户菜单缓存
|
|
entity.ClearUserPowerFunc(in.UserId, in.AppId)
|
|
entity.ClearUserPowerFunc(in.UserId, in.AppId)
|
|
- logx.Info("+++++++++++++++++++++++++++++++++++++")
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
t1 := time.Now()
|
|
t1 := time.Now()
|
|
@@ -222,7 +219,6 @@ func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq) ([]*pb.MenuList, error)
|
|
EntId: in.EntId,
|
|
EntId: in.EntId,
|
|
EntUserId: in.EntUserId,
|
|
EntUserId: in.EntUserId,
|
|
}
|
|
}
|
|
- logx.Info("-----TimeOut:", wdm.TimeOut, "-----entuserId:", wdm.EntUserId)
|
|
|
|
for _, v := range *menuData {
|
|
for _, v := range *menuData {
|
|
menu := &entity.JYMenu{
|
|
menu := &entity.JYMenu{
|
|
Id: MC.IntAll(v["id"]),
|
|
Id: MC.IntAll(v["id"]),
|
|
@@ -272,7 +268,6 @@ func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq) ([]*pb.MenuList, error)
|
|
if err == nil && len(menuList) > 0 {
|
|
if err == nil && len(menuList) > 0 {
|
|
if menuBytes, err := json.Marshal(menuList); err == nil {
|
|
if menuBytes, err := json.Marshal(menuList); err == nil {
|
|
redisOutTime := int(in.RedisOutTime) + rand.Intn(60)
|
|
redisOutTime := int(in.RedisOutTime) + rand.Intn(60)
|
|
- logx.Info("-----redisOutTime:", redisOutTime)
|
|
|
|
if redis.PutBytes(entity.RedisCode, RedisMenuKey, &menuBytes, redisOutTime) != nil {
|
|
if redis.PutBytes(entity.RedisCode, RedisMenuKey, &menuBytes, redisOutTime) != nil {
|
|
logx.Info("工作桌面菜单 redis缓存异常")
|
|
logx.Info("工作桌面菜单 redis缓存异常")
|
|
}
|
|
}
|