Merge pull request '修改运营分析界面用户下载报告及界面所有用户统计时间的Bug' (#897) from zouap_static into V20211115

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/897
Reviewed-by: ychao_1983 <ychao_1983@sina.com>

models/user_business_analysis.go

@@ -199,17 +199,16 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus
 		}
 		statictisSess.Limit(opts.PageSize, start)
 	}
-	statictisSess.OrderBy("count_date 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
 	}
 
 	resultMap := make(map[int64]*UserBusinessAnalysis)
 
-	if opts.Page >= 0 && opts.PageSize > 0 && len(userBusinessAnalysisList) > 0 {
+	if len(userBusinessAnalysisList) > 0 {
 		var newAndCond = builder.NewCond()
 		var newOrCond = builder.NewCond()
 		for _, userRecord := range userBusinessAnalysisList {
@@ -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
 		}