|
@@ -86,11 +86,23 @@ func (s *ComSortList) Less(i, j int) bool {
|
|
|
continue
|
|
|
}
|
|
|
if v.Type == "string" {
|
|
|
- return ObjToString(i_v) > ObjToString(j_v) && v.Order < 0
|
|
|
+ if v.Order < 0 {
|
|
|
+ return ObjToString(i_v) > ObjToString(j_v)
|
|
|
+ } else {
|
|
|
+ return ObjToString(i_v) < ObjToString(j_v)
|
|
|
+ }
|
|
|
} else if v.Type == "float" {
|
|
|
- return Float64All(i_v) > Float64All(j_v) && v.Order < 0
|
|
|
+ if v.Order < 0 {
|
|
|
+ return Float64All(i_v) > Float64All(j_v)
|
|
|
+ } else {
|
|
|
+ return Float64All(i_v) < Float64All(j_v)
|
|
|
+ }
|
|
|
} else {
|
|
|
- return Int64All(i_v) > Int64All(j_v) && v.Order < 0
|
|
|
+ if v.Order < 0 {
|
|
|
+ return Int64All(i_v) > Int64All(j_v)
|
|
|
+ } else {
|
|
|
+ return Int64All(i_v) < Int64All(j_v)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return false
|