From 395a5ebea8f1f6cd2b50c6bd06d062802b7692d9 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 15 Nov 2021 17:23:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index c8bd85bfb..8eb980471 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -88,7 +88,15 @@ type UserBusinessAnalysisList []*UserBusinessAnalysis func (ulist UserBusinessAnalysisList) Swap(i, j int) { ulist[i], ulist[j] = ulist[j], ulist[i] } func (ulist UserBusinessAnalysisList) Len() int { return len(ulist) } func (ulist UserBusinessAnalysisList) Less(i, j int) bool { - return ulist[i].CommitCount > ulist[j].CommitCount + if ulist[i].CommitCount > ulist[j].CommitCount { + return true + } else { + if ulist[i].CommitCount == ulist[j].CommitCount { + return ulist[i].ID > ulist[j].ID + } else { + return false + } + } } func QueryUserStaticData(startTime int64, endTime int64) []*UserBusinessAnalysis { From 9ad7093d70fa03bdcb3c4968ce0f2972b10825a0 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 16 Nov 2021 08:49:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E8=AE=B0=E5=BD=95=E6=95=B0=E5=8F=AF=E9=80=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 2 +- routers/repo/user_data_analysis.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 8eb980471..f0bdbc950 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -154,7 +154,7 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus var cond = builder.NewCond() if len(opts.UserName) > 0 { cond = cond.And( - builder.Eq{"name": opts.UserName}, + builder.Like{"name", opts.UserName}, ) } cond = cond.And( diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index e24416d4f..2737116bf 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -29,6 +29,10 @@ func QueryUserStaticDataPage(ctx *context.Context) { if page <= 0 { page = 1 } + pageSize := ctx.QueryInt("pageSize") + if pageSize <= 0 { + pageSize = setting.UI.IssuePagingNum + } userName := ctx.Query("userName") log.Info("startDate=" + startDate + " endDate=" + endDate + " userName=" + userName + " page=" + fmt.Sprint(page)) @@ -39,7 +43,7 @@ func QueryUserStaticDataPage(ctx *context.Context) { pageOpts := &models.UserBusinessAnalysisQueryOptions{ ListOptions: models.ListOptions{ Page: page, - PageSize: setting.UI.IssuePagingNum, + PageSize: pageSize, }, UserName: userName, StartTime: startTime.Unix(),