feat:权益异常处理

entity/user.go

@@ -78,7 +78,7 @@ func (m *WorkDesktopMenu) AutoUserPowerInfo() map[string]int {
 		PositionId:   m.PositionId,
 		MgoUserId:    m.MgoUserId,
 	}
-	logx.Info("userInfoRpc-------------------------:", userInfoRpc)
+	logx.Info(m.MgoUserId, "------------------userInfoRpc-------------------------:", userInfoRpc)
 	//权益中台获取权益
 	userPowers := userInfoRpc.GetUserPowers()
 	if userPowers != nil {
@@ -242,6 +242,8 @@ func ClearUserPowerFunc(positionId, appId string) bool {
 	for _, v := range []string{"PC", "APP", "WX"} {
 		redis.Del(RedisCode, fmt.Sprintf(RedisMenuKey, appId, v, ConfigJson.MenuCacheKey, positionId))
 	}
+	//用户权限缓存
+	redis.Del(RedisCode, fmt.Sprintf(UserPowerRedisKey, appId, time.Now().Day(), positionId))
 	//用户菜单缓存
 	return true
 }

entity/workDesktop.go

@@ -1,20 +1,17 @@
 package entity
 
 import (
-	"app.yhyue.com/moapp/jybase/redis"
+	MC "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
 	"database/sql"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
 	"sort"
 	"strconv"
 	"strings"
-	"time"
-
-	MC "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/encrypt"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 // WorkDesktopMenu 工作桌面菜单信息
@@ -336,8 +333,6 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 			defer userInfo.Lock.Unlock()
 			userInfo.Permissions = map[string]int{}
 			userInfo.Capitals = map[string]int{}
-			//一次菜单请求 一次缓存
-			redis.Del(RedisCode, fmt.Sprintf(UserPowerRedisKey, appId, time.Now().Day(), userId))
 		}
 	}(m.NewUserId, m.AppId, m.UserId)
 	//bytes, _ := json.MarshalIndent(menuList, "", "   ")

rpc/internal/logic/workdesktopcomprehensivelogic.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	MC "app.yhyue.com/moapp/jybase/common"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/internal/svc"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/service"
@@ -26,5 +27,8 @@ func NewWorkDesktopComprehensiveLogic(ctx context.Context, svcCtx *svc.ServiceCo
 //工作桌面--常用功能更新
 //工作桌面--常用功能列表
 func (l *WorkDesktopComprehensiveLogic) WorkDesktopComprehensive(in *pb.WorkDesktopComprehensiveReq) (*pb.WorkDesktopComprehensiveResp, error) {
+	//个人版没有mgoUserId，in.PositionType == "0"
+	in.MgoUserId = MC.If(in.PositionType == "0", in.UserId, in.MgoUserId).(string)
+	in.UserId = MC.If(in.PositionId != "", in.PositionId, in.UserId).(string) //p278职位id（没有企业 职位id是个人职位id，职位id对应相应的企业）  职位id 慢慢替换 userId
 	return service.RenewWorkDesktopMenuModeOrCommonly(in), nil
 }

service/workDesktop.go

@@ -21,7 +21,6 @@ import (
 // 工作桌面--常用功能更新
 // 工作桌面--常用功能列表
 func RenewWorkDesktopMenuModeOrCommonly(in *WorkDesktopComprehensiveReq) (r *WorkDesktopComprehensiveResp) {
-	in.UserId = MC.If(in.PositionId != "", in.PositionId, in.UserId).(string) //职位id替换原userId
 	r = &WorkDesktopComprehensiveResp{}
 	switch in.ActionMode {
 	case "commonlyRenew": //常用功能更新
@@ -107,6 +106,7 @@ func RenewWorkDesktopMenuModeOrCommonly(in *WorkDesktopComprehensiveReq) (r *Wor
 						PositionType: positionType,
 						PositionId:   positionId,
 						IntranetBool: in.IntranetBool,
+						MgoUserId:    in.MgoUserId,
 					}
 					childMenus = map[int][]*entity.JYMenu{}
 				)
@@ -280,6 +280,7 @@ func GetWordDesktopMenuTree(in *WorkDesktopMenuInfoReq) ([]*pb.MenuList, error)
 		PositionId:   positionId,
 		MgoUserId:    in.MgoUserId,
 	}
+	logx.Info("--------wdm--MgoUserId-------:", wdm.MgoUserId)
 	//获取菜单树的数据
 	if err := wdm.GetMenuTreeData(); err != nil {
 		return nil, err