From 40e91c56ae3775ac3d12104397a3cc2591b9b374 Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Wed, 13 Apr 2022 11:20:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v1/common/req.go                    | 9 ++++-----
 internal/app/system/service/sys_user.go | 7 ++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/api/v1/common/req.go b/api/v1/common/req.go
index 45b25e5..58e8fd8 100644
--- a/api/v1/common/req.go
+++ b/api/v1/common/req.go
@@ -9,11 +9,10 @@ package common
 
 // PageReq 公共请求参数
 type PageReq struct {
-	BeginTime string `p:"beginTime"` //开始时间
-	EndTime   string `p:"endTime"`   //结束时间
-	PageNum   int    `p:"pageNum"`   //当前页码
-	PageSize  int    `p:"pageSize"`  //每页数
-	OrderBy   string //排序方式
+	DateRange []string `p:"dateRange"` //日期范围
+	PageNum   int      `p:"pageNum"`   //当前页码
+	PageSize  int      `p:"pageSize"`  //每页数
+	OrderBy   string   //排序方式
 }
 
 // ListRes 列表公共返回
diff --git a/internal/app/system/service/sys_user.go b/internal/app/system/service/sys_user.go
index b2b9edc..3e33a77 100644
--- a/internal/app/system/service/sys_user.go
+++ b/internal/app/system/service/sys_user.go
@@ -331,11 +331,8 @@ func (s *userImpl) List(ctx context.Context, req *system.UserSearchReq) (total i
 		if req.Mobile != "" {
 			m = m.Where("mobile like ?", "%"+req.Mobile+"%")
 		}
-		if req.BeginTime != "" {
-			m = m.Where("created_at >=?", req.BeginTime)
-		}
-		if req.EndTime != "" {
-			m = m.Where("created_at <=?", req.EndTime)
+		if len(req.DateRange) > 0 {
+			m = m.Where("created_at >=? AND created_at <=?", req.DateRange[0], req.DateRange[1])
 		}
 		if req.PageSize == 0 {
 			req.PageSize = consts.PageSize