分支合并

api/internal/logic/workdesktopclearuserinfologic.go

@@ -30,6 +30,9 @@ func NewWorkDesktopClearUserInfoLogic(ctx context.Context, svcCtx *svc.ServiceCo
 }
 
 func (l *WorkDesktopClearUserInfoLogic) WorkDesktopClearUserInfo(req *types.WorkDesktopClearUserInfo) (resp *types.CommonResp, err error) {
+	if req.Platform == "H5" {
+		req.Platform = "APP"
+	}
 	//有管理员权限
 	if config.ManagerUserIdsMap[req.UserId] {
 		res, err := entity.UserCenterRpc.WorkDesktopClearUserInfo(l.ctx, &pb.WorkDesktopClearUserInfoReq{

api/internal/logic/workdesktopcomprehensivelogic.go

@@ -33,6 +33,9 @@ func NewWorkDesktopComprehensiveLogic(ctx context.Context, svcCtx *svc.ServiceCo
 }
 
 func (l *WorkDesktopComprehensiveLogic) WorkDesktopComprehensive(req *types.WorkDesktopComprehensiveReq) (resp *types.CommonResp, err error) {
+	if req.Platform == "H5" {
+		req.Platform = "APP"
+	}
 	res, err := entity.UserCenterRpc.WorkDesktopComprehensive(l.ctx, &pb.WorkDesktopComprehensiveReq{
 		AppId:        req.AppId,
 		UserId:       req.UserId,

api/internal/logic/workdesktopmenuinfologic.go

@@ -33,6 +33,9 @@ func NewWorkDesktopMenuInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext
 }
 
 func (l *WorkDesktopMenuInfoLogic) WorkDesktopMenuInfo(req *types.WorkDesktopMenuInfoReq) (resp *types.CommonResp, err error) {
+	if req.Platform == "H5" {
+		req.Platform = "APP"
+	}
 	res, err := entity.UserCenterRpc.WorkDesktopMenuInfo(l.ctx, &pb.WorkDesktopMenuInfoReq{
 		AppId:        req.AppId,
 		UserId:       req.UserId,

api/internal/types/types.go

@@ -236,6 +236,7 @@ type UserDelReq struct {
 }
 
 type WorkDesktopMenuInfoReq struct {
+<<<<<<< HEAD
 	Platform     string `json:"platform,default=PC,options=PC|WX|APP"`
 	UserId       string `header:"userId"`
 	AppId        string `header:"appId"`
@@ -267,6 +268,28 @@ type WorkDesktopComprehensiveReq struct {
 	PositionType string `header:"positionType,optional"` //职位类型 0个人 1企业
 	PositionId   string `header:"positionId,optional"`   //职位id
 	MgoUserId    string `header:"mgoUserId,optional"`    //原userId
+=======
+	Platform  string `json:"platform,default=PC,options=PC|WX|APP|H5"`
+	UserId    string `header:"userId"`
+	AppId     string `header:"appId"`
+	Phone     string `header:"phone,optional"`
+	NewUserId string `header:"newUserId"` //base_user_id<---base_user
+	EntId     int64  `header:"entId,optional"`
+	EntUserId int64  `header:"entUserId,optional"`
+}
+
+type WorkDesktopComprehensiveReq struct {
+	Platform   string `json:"platform,default=PC,options=PC|WX|APP|H5"`
+	UserId     string `header:"userId"`
+	AppId      string `header:"appId"`
+	Phone      string `header:"phone,optional"`
+	MenuMode   string `json:"menuMode,optional"`
+	MenuIds    string `json:"menuIds,optional"`
+	ActionMode string `path:"actionMode,options=commonlyRenew|commonlyList|menuMode"`
+	NewUserId  string `header:"newUserId"`
+	EntId      int64  `header:"entId,optional"`
+	EntUserId  int64  `header:"entUserId,optional"`
+>>>>>>> master
 }
 
 type CommonResp struct {
@@ -276,10 +299,18 @@ type CommonResp struct {
 }
 
 type WorkDesktopClearUserInfo struct {
+<<<<<<< HEAD
 	Platform   string `json:"platform,default=PC,options=PC|WX|APP"`
 	UserId     string `header:"userId"`
 	PositionId string `header:"positionId,optional"` //职位id
 	AppId      string `header:"appId"`
+=======
+	Platform  string `json:"platform,default=PC,options=PC|WX|APP|H5"`
+	UserId    string `header:"userId"`
+	AppId     string `header:"appId"`
+	UserIds   string `json:"userIds,optional"`
+	NewUserId string `header:"newUserId"`
+>>>>>>> master
 }
 
 type UserIdentityReq struct {

api/userCenter.api

@@ -250,6 +250,7 @@ type (
 
 	//工作桌面 -- 菜单
 	WorkDesktopMenuInfoReq {
+<<<<<<< HEAD
 		Platform     string `json:"platform,default=PC,options=PC|WX|APP"`
 		UserId       string `header:"userId"`
 		AppId        string `header:"appId"`
@@ -263,10 +264,20 @@ type (
 		PositionId   string `header:"positionId,optional"`   //职位id
 		WorkStatus   int64  `json:"workStatus,optional"`     //服务是否可用；1:内网可用；-1：不可用
 		MgoUserId    string `header:"mgoUserId,optional"`    //原userId
+=======
+		Platform  string `json:"platform,default=PC,options=PC|WX|APP|H5"`
+		UserId    string `header:"userId"`
+		AppId     string `header:"appId"`
+		Phone     string `header:"phone,optional"`
+		NewUserId string `header:"newUserId"` //base_user_id<---base_user
+		EntId     int64  `header:"entId,optional"`
+		EntUserId int64  `header:"entUserId,optional"`
+>>>>>>> master
 	}
 	//工作桌面-- 菜单模式：全部/可用选择记录
 	//工作桌面--常用功能更新
 	WorkDesktopComprehensiveReq {
+<<<<<<< HEAD
 		Platform     string `json:"platform,default=PC,options=PC|WX|APP"`
 		UserId       string `header:"userId"`
 		AppId        string `header:"appId"`
@@ -282,6 +293,18 @@ type (
 		PositionType string `header:"positionType,optional"` //职位类型 0个人 1企业
 		PositionId   string `header:"positionId,optional"`   //职位id
 		MgoUserId    string `header:"mgoUserId,optional"`    //原userId
+=======
+		Platform   string `json:"platform,default=PC,options=PC|WX|APP|H5"`
+		UserId     string `header:"userId"`
+		AppId      string `header:"appId"`
+		Phone      string `header:"phone,optional"`
+		MenuMode   string `json:"menuMode,optional"`
+		MenuIds    string `json:"menuIds,optional"`
+		ActionMode string `path:"actionMode,options=commonlyRenew|commonlyList|menuMode"`
+		NewUserId  string `header:"newUserId"`
+		EntId      int64  `header:"entId,optional"`
+		EntUserId  int64  `header:"entUserId,optional"`
+>>>>>>> master
 	}
 	//
 	CommonResp {
@@ -291,10 +314,18 @@ type (
 	}
 	//工作桌面清用户内存信息
 	WorkDesktopClearUserInfo {
+<<<<<<< HEAD
 		Platform   string `json:"platform,default=PC,options=PC|WX|APP"`
 		UserId     string `header:"userId"`
 		PositionId string `header:"positionId,optional"` //职位id
 		AppId      string `header:"appId"`
+=======
+		Platform  string `json:"platform,default=PC,options=PC|WX|APP|H5"`
+		UserId    string `header:"userId"`
+		AppId     string `header:"appId"`
+		UserIds   string `json:"userIds,optional"`
+		NewUserId string `header:"newUserId"`
+>>>>>>> master
 	}
 
 	UserIdentityReq {