From 8be40ffd79c4dcdb4dc00bef359ccf48a6b031f3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 28 十月 2023 15:56:26 +0800
Subject: [PATCH] 若干接口支持查看下属数据
---
api/v1/salesRefund.go | 2 +-
service/lru.go | 1 +
api/v1/serviceContract.go | 2 +-
middleware/jwt.go | 1 +
api/v1/salesDetails.go | 2 +-
api/v1/serviceOrder.go | 2 +-
model/request/jwt.go | 5 +++--
api/v1/salesReturn.go | 2 +-
api/v1/serviceFollowup.go | 2 +-
9 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index 1a1e37d..1fbf0d9 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.go
@@ -182,7 +182,7 @@
var memberIds []int
userInfo := utils.GetUserInfo(c)
if userInfo.UserType == constvar.UserTypeSub {
- memberIds = []int{userInfo.CrmUserId}
+ memberIds = userInfo.SubUserIds
}
salesDetailss, total, errCode := salesDetailsService.GetSalesDetailsList(params, memberIds)
diff --git a/api/v1/salesRefund.go b/api/v1/salesRefund.go
index 00ce774..174077c 100644
--- a/api/v1/salesRefund.go
+++ b/api/v1/salesRefund.go
@@ -184,7 +184,7 @@
var memberIds []int
userInfo := utils.GetUserInfo(c)
if userInfo.UserType == constvar.UserTypeSub {
- memberIds = []int{userInfo.CrmUserId}
+ memberIds = userInfo.SubUserIds
}
salesRefunds, total, errCode := salesRefundService.GetSalesRefundList(params.Page, params.PageSize, params.KeywordType, params.Keyword, params.SourceId, memberIds)
diff --git a/api/v1/salesReturn.go b/api/v1/salesReturn.go
index 4e21782..70d3643 100644
--- a/api/v1/salesReturn.go
+++ b/api/v1/salesReturn.go
@@ -179,7 +179,7 @@
var memberIds []int
userInfo := utils.GetUserInfo(c)
if userInfo.UserType == constvar.UserTypeSub {
- memberIds = []int{userInfo.CrmUserId}
+ memberIds = userInfo.SubUserIds
}
salesReturns, total, errCode := salesReturnService.GetSalesReturnList(params, memberIds)
diff --git a/api/v1/serviceContract.go b/api/v1/serviceContract.go
index 1edad01..e5b97d9 100644
--- a/api/v1/serviceContract.go
+++ b/api/v1/serviceContract.go
@@ -134,7 +134,7 @@
var memberIds []int
userInfo := utils.GetUserInfo(c)
if userInfo.UserType == constvar.UserTypeSub {
- memberIds = []int{userInfo.CrmUserId}
+ memberIds = userInfo.SubUserIds
}
serviceContracts, total, errCode := serviceContractService.GetServiceContractList(params, memberIds)
diff --git a/api/v1/serviceFollowup.go b/api/v1/serviceFollowup.go
index d457ead..ce3bbc5 100644
--- a/api/v1/serviceFollowup.go
+++ b/api/v1/serviceFollowup.go
@@ -165,7 +165,7 @@
var memberIds []int
userInfo := utils.GetUserInfo(c)
if userInfo.UserType == constvar.UserTypeSub {
- memberIds = []int{userInfo.CrmUserId}
+ memberIds = userInfo.SubUserIds
}
serviceFollowups, total, errCode := serviceFollowupService.GetServiceFollowupList(params.Page, params.PageSize, params.KeywordType, params.Keyword, params.ServiceOrderId, memberIds)
diff --git a/api/v1/serviceOrder.go b/api/v1/serviceOrder.go
index e557bd7..b03eb64 100644
--- a/api/v1/serviceOrder.go
+++ b/api/v1/serviceOrder.go
@@ -153,7 +153,7 @@
var memberIds []int
userInfo := utils.GetUserInfo(c)
if userInfo.UserType == constvar.UserTypeSub {
- memberIds = []int{userInfo.CrmUserId}
+ memberIds = userInfo.SubUserIds
}
serviceOrder, total, errCode := service.NewServiceOrderService().GetServiceOrderList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword, params.ServiceContractId, params.SalesDetailsId, memberIds)
diff --git a/middleware/jwt.go b/middleware/jwt.go
index eac7b32..5007bac 100644
--- a/middleware/jwt.go
+++ b/middleware/jwt.go
@@ -115,6 +115,7 @@
claims.CrmUserId = userInfo.UserId
claims.NickName = userInfo.NickName
+ claims.SubUserIds = userInfo.SubUserIds
c.Set("claims", claims)
if CheckAuth(c.Request.URL.Path, token) {
c.Next()
diff --git a/model/request/jwt.go b/model/request/jwt.go
index e67ab55..606e7b4 100644
--- a/model/request/jwt.go
+++ b/model/request/jwt.go
@@ -10,8 +10,9 @@
BaseClaims
BufferTime int64
jwt.StandardClaims
- CrmUserId int
- NickName string
+ CrmUserId int
+ NickName string
+ SubUserIds []int //鍖呭惈鑷韩鐨刬d
}
type BaseClaims struct {
diff --git a/service/lru.go b/service/lru.go
index 5a8f73d..040f2b6 100644
--- a/service/lru.go
+++ b/service/lru.go
@@ -28,6 +28,7 @@
return nil
}
subIds, _, err := userService.UUID2CrmUserId(strings.Split(userRecord.SubUserIds, ","))
+ subIds = append(subIds, userRecord.ID)
if err != nil {
return nil
}
--
Gitblit v1.8.0