From 244b7b5fb973698648f9ff1fc3fbd93e7271e284 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 28 十月 2023 16:45:26 +0800
Subject: [PATCH] 获取员工列表只展示下属员工
---
service/user.go | 4 ++--
service/dataServer.go | 14 ++++++++++++--
model/user.go | 14 ++++++++++++++
api/v1/getAllData.go | 2 +-
4 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/api/v1/getAllData.go b/api/v1/getAllData.go
index 08c983d..6ddb884 100644
--- a/api/v1/getAllData.go
+++ b/api/v1/getAllData.go
@@ -21,7 +21,7 @@
return
}
- errCode, data := allDataServer.GetAllData()
+ errCode, data := allDataServer.GetAllData(c)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
diff --git a/model/user.go b/model/user.go
index 93e8c3d..42f71dd 100644
--- a/model/user.go
+++ b/model/user.go
@@ -38,6 +38,7 @@
PageNum int
PageSize int
Orm *gorm.DB
+ IDs []int
}
)
@@ -77,6 +78,11 @@
return slf
}
+func (slf *UserSearch) SetUserIds(userIds []int) *UserSearch {
+ slf.IDs = userIds
+ return slf
+}
+
func (slf *UserSearch) SetUserName(username string) *UserSearch {
slf.Username = username
return slf
@@ -106,6 +112,14 @@
db = db.Order(slf.Order)
}
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
+ }
+
+ if len(slf.IDs) > 0 {
+ db = db.Where("id in ?", slf.IDs)
+ }
+
return db
}
diff --git a/service/dataServer.go b/service/dataServer.go
index 4ea3990..63f1d40 100644
--- a/service/dataServer.go
+++ b/service/dataServer.go
@@ -1,13 +1,16 @@
package service
import (
+ "aps_crm/constvar"
"aps_crm/model/response"
"aps_crm/pkg/ecode"
+ "aps_crm/utils"
+ "github.com/gin-gonic/gin"
)
type DataServer struct{}
-func (DataServer) GetAllData() (errCode int, data response.DataResponse) {
+func (DataServer) GetAllData(c *gin.Context) (errCode int, data response.DataResponse) {
// get country list
countryList, _ := ServiceGroup.GetCountryList()
data.Country = countryList
@@ -73,7 +76,14 @@
data.RegularCustomers = regularCustomerList
// get Member list
- memberList, _ := ServiceGroup.GetUserList()
+
+ var memberIds []int
+ userInfo := utils.GetUserInfo(c)
+ if userInfo.UserType == constvar.UserTypeSub {
+ memberIds = userInfo.SubUserIds
+ }
+
+ memberList, _ := ServiceGroup.GetUserList(memberIds)
data.Member = memberList
// get Department list
diff --git a/service/user.go b/service/user.go
index 182b747..923ccc2 100644
--- a/service/user.go
+++ b/service/user.go
@@ -90,8 +90,8 @@
})
}
-func (userService *UserService) GetUserList() (userList []*model.User, err error) {
- return model.NewUserSearch(nil).FindAll()
+func (userService *UserService) GetUserList(userIds []int) (userList []*model.User, err error) {
+ return model.NewUserSearch(nil).SetUserIds(userIds).FindAll()
}
func (userService *UserService) UUID2CrmUserId(uuids []string) (crmUserIds []int, m map[string]int, err error) {
--
Gitblit v1.8.0