|
|
@@ -199,10 +199,9 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus |
|
|
|
} |
|
|
|
statictisSess.Limit(opts.PageSize, start) |
|
|
|
} |
|
|
|
statictisSess.OrderBy("count_date desc, commit_count desc") |
|
|
|
|
|
|
|
userBusinessAnalysisList := make([]*UserBusinessAnalysis, 0) |
|
|
|
if err := statictisSess.Table("user_business_analysis").Where(cond). |
|
|
|
if err := statictisSess.Table("user_business_analysis").Where(cond).OrderBy("count_date desc"). |
|
|
|
Find(&userBusinessAnalysisList); err != nil { |
|
|
|
return nil, 0 |
|
|
|
} |
|
|
@@ -228,9 +227,8 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus |
|
|
|
builder.Lte{"count_date": opts.EndTime}, |
|
|
|
) |
|
|
|
} |
|
|
|
|
|
|
|
userBusinessAnalysisList = make([]*UserBusinessAnalysis, 0) |
|
|
|
if err := statictisSess.Table("user_business_analysis").Where(newAndCond). |
|
|
|
if err := statictisSess.Table("user_business_analysis").Where(newAndCond).OrderBy("count_date desc"). |
|
|
|
Find(&userBusinessAnalysisList); err != nil { |
|
|
|
return nil, 0 |
|
|
|
} |
|
|
|