xingzai 1 سال پیش
والد
کامیت
0e5bbf644f
1فایلهای تغییر یافته به همراه2 افزوده شده و 1 حذف شده
  1. 2 1
      controllers/cygx/user.go

+ 2 - 1
controllers/cygx/user.go

@@ -2663,7 +2663,7 @@ func (this *UserController) CompanyExportInteraction() {
 			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 {
@@ -2751,6 +2751,7 @@ 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() {