|
@@ -2751,7 +2751,6 @@ func (this *UserController) CompanyExportInteraction() {
|
|
|
if activityName != "" {
|
|
|
condition += ` AND a.activity_name LIKE '%` + activityName + `%' `
|
|
|
}
|
|
|
- condition += ` ORDER BY a.activity_name DESC `
|
|
|
if isAdminRole {
|
|
|
list, err = cygx.GetActivityMeetByCompany(condition, 0, pageSize)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
@@ -4006,6 +4005,7 @@ func (this *UserController) CompanyExportInteractionList() {
|
|
|
endDate += " 23:59:59"
|
|
|
condition += ` AND r.create_time <= '` + endDate + `' `
|
|
|
}
|
|
|
+ condition += ` ORDER BY r.create_time DESC `
|
|
|
var pars []interface{}
|
|
|
var listRecord []*cygx.CygxArticleAndYanxuanRecordResp
|
|
|
if isAdminRole {
|