Merge branch 'V20211115' of git.openi.org.cn:OpenI/aiforge into download-model-error

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 {
@@ -146,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(

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(),