From d6979e15d35b20a81c19b561f09e78fa3cb4d651 Mon Sep 17 00:00:00 2001
From: dlcios <dlcios@163.com>
Date: Mon, 27 Nov 2023 09:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E9=A1=B6=E7=BA=A7-=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=83=A8=E9=97=A8=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v1/visitor.go              | 2 +-
 internal/controller/visitor.go | 8 ++++++++
 internal/service/visitor.go    | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/api/v1/visitor.go b/api/v1/visitor.go
index 7518228..ca37451 100644
--- a/api/v1/visitor.go
+++ b/api/v1/visitor.go
@@ -74,7 +74,7 @@ type GetDepartmentListRes struct {
 type GetDingUserReq struct {
 	g.Meta   `path:"/get_user_list" tags:"user id list" method:"post" summary:"user id list"`
 	DeptId   int `json:"dept_id"`
-	PageNum  int `json:"cursor"`
+	PageNum  int `json:"page_num"`
 	PageSize int `json:"page_size"`
 }
 
diff --git a/internal/controller/visitor.go b/internal/controller/visitor.go
index cbc9324..8050543 100644
--- a/internal/controller/visitor.go
+++ b/internal/controller/visitor.go
@@ -54,6 +54,14 @@ func (c *cVisitor) GetDepartmentList(ctx context.Context, req *v1.GetDepartmentL
 }
 
 func (c *cVisitor) GetDingUserList(ctx context.Context, req *v1.GetDingUserReq) (res *v1.GetDingUserRes, err error) {
+	if req.PageNum == 0 {
+		req.PageNum = 1
+	}
+
+	if req.PageSize == 0 {
+		req.PageNum = 15
+	}
+
 	res, err = service.Visitor.GetDingUserList(ctx, req)
 	if err != nil {
 		return nil, gerror.Newf("系统繁忙，请稍后再试")
diff --git a/internal/service/visitor.go b/internal/service/visitor.go
index 8f1d325..15a1185 100644
--- a/internal/service/visitor.go
+++ b/internal/service/visitor.go
@@ -83,9 +83,11 @@ func (s *visitorService) GetDingUserList(ctx context.Context, req *v1.GetDingUse
 		return nil, gerror.Newf("获取用户列表失败")
 	}
 
+	cursor := (req.PageNum - 1) * req.PageSize
+
 	condition := g.Map{
 		"language":             "zh_CN",
-		"cursor":               req.PageNum,
+		"cursor":               cursor,
 		"size":                 req.PageSize,
 		"dept_id":              req.DeptId,
 		"contain_access_limit": true,