Merge branch 'fix/xy_report_v2'

controllers/data_manage/com_trade.go

@@ -147,11 +147,18 @@ func (this *EdbInfoController) ComTradeDataList() {
 	sortParam := this.GetString("SortParam")
 	sortType := this.GetString("SortType")
 	sortStr := ``
-	if sortParam != `` {
-		sortStr = fmt.Sprintf("%s %s,modify_time desc ", sortParam, sortType)
-	} else {
-		sortStr = " data_time desc,modify_time desc "
+
+	switch sortParam {
+	case "data_time":
+	default:
+		sortParam = " data_time "
+	}
+	switch sortType {
+	case "desc", "asc":
+	default:
+		sortType = "desc"
 	}
+	sortStr = fmt.Sprintf("%s %s,modify_time desc ", sortParam, sortType)
 
 	total, err := data_manage.GetComTradeListCount(condition, pars)
 	if err != nil && err.Error() != utils.ErrNoRow() {

controllers/data_manage/edb_info_refresh.go

@@ -277,6 +277,17 @@ func (c *EdbInfoController) RefreshEdbList() {
 	sortParam := c.GetString("SortParam")
 	sortType := c.GetString("SortType")
 
+	switch sortParam {
+	case "end_date":
+	default:
+		sortParam = " end_date "
+	}
+	switch sortType {
+	case "desc", "asc":
+	default:
+		sortType = "desc"
+	}
+
 	pageSize, _ := c.GetInt("PageSize")
 	currentIndex, _ := c.GetInt("CurrentIndex")
 	var startSize int