Merge branch 'dev_v1.0.4_wh' of CRM/application into hotfix/v1.0.4.2

api/internal/service/owner.go

@@ -139,11 +139,9 @@ func (t *OwnerService) OwnerlList() map[string]interface{} {
 	startIndex := (t.PageIndex - 1) * t.PageSize
 	endIndex := t.PageIndex * t.PageSize
 	sort.Slice(returnData, func(i, j int) bool {
-		if returnData[i].Zbtime != 0 {
-			return returnData[i].Zbtime > returnData[j].Zbtime
-		} else {
-			return returnData[i].BuyerId > returnData[j].BuyerId
-		}
+		aa := fmt.Sprintf("%s%s", returnData[i].Zbtime, returnData[i].BuyerId)
+		bb := fmt.Sprintf("%s%s", returnData[j].Zbtime, returnData[j].BuyerId)
+		return aa > bb
 	})
 	if startIndex < gconv.Int64(len(returnData)) {
 		if endIndex > gconv.Int64(len(returnData)) {
@@ -383,7 +381,6 @@ where
 	sort.Slice(returnData, func(i, j int) bool {
 		return gconv.Int64(returnData[i]["zbtime"]) > gconv.Int64(returnData[j]["zbtime"])
 	})
-
 	return returnData
 }