add

src/main/java/com/tanpu/fund/service/impl/ProductServiceImpl.java

@@ -1855,87 +1855,39 @@ public class ProductServiceImpl implements ProductService, Constant {
     private void filterSort(FundRankReq req, FundCountExample example) {
         if (StringUtils.isNotEmpty(req.getRank())) {
             String sort = null;
-            switch (req.getRank()) {
-                case "day":
-                    sort = "ret_1day ";
-                    if (StringUtils.isNotEmpty(req.getRankSort())) {
-                        sort = sort + req.getRankSort() + ", ";
-                    } else {
-                        sort = sort + "desc,";
-                    }
-                    break;
-                case "week":
-                    sort = "ret_1w ";
-                    if (StringUtils.isNotEmpty(req.getRankSort())) {
-                        sort = sort + req.getRankSort() + ", ";
-                    } else {
-                        sort = sort + "desc,";
-                    }
-                    break;
-                case "month":
-                    sort = "ret_1m ";
-                    if (StringUtils.isNotEmpty(req.getRankSort())) {
-                        sort = sort + req.getRankSort() + ", ";
-                    } else {
-                        sort = sort + "desc,";
-                    }
-                    break;
-                case "season":
-                    sort = "ret_3m ";
-                    if (StringUtils.isNotEmpty(req.getRankSort())) {
-                        sort = sort + req.getRankSort() + ", ";
-                    } else {
-                        sort = sort + "desc,";
-                    }
-                    break;
-                case "halfAYear":
-                    sort = "ret_6m ";
-                    if (StringUtils.isNotEmpty(req.getRankSort())) {
-                        sort = sort + req.getRankSort() + ", ";
-                    } else {
-                        sort = sort + "desc,";
-                    }
-                    break;
-                case "year":
-                    sort = "ret_1y ";
-                    if (StringUtils.isNotEmpty(req.getRankSort())) {
-                        sort = sort + req.getRankSort() + ", ";
-                    } else {
-                        sort = sort + "desc,";
-                    }
-                    break;
-                case "twoYear":
-                    sort = "ret_2y ";
-                    if (StringUtils.isNotEmpty(req.getRankSort())) {
-                        sort = sort + req.getRankSort() + ", ";
-                    } else {
-                        sort = sort + "desc,";
-                    }
-                    break;
-                case "threeYear":
-                    sort = "ret_3y ";
-                    if (StringUtils.isNotEmpty(req.getRankSort())) {
-                        sort = sort + req.getRankSort() + ", ";
-                    } else {
-                        sort = sort + "desc,";
-                    }
-                    break;
-                case "fiveYear":
-                    sort = "ret_5y ";
-                    if (StringUtils.isNotEmpty(req.getRankSort())) {
-                        sort = sort + req.getRankSort() + ", ";
-                    } else {
-                        sort = sort + "desc,";
-                    }
-                    break;
-                case "retIncep":
-                    sort = "ret_incep ";
-                    if (StringUtils.isNotEmpty(req.getRankSort())) {
-                        sort = sort + req.getRankSort() + ", ";
-                    } else {
-                        sort = sort + "desc,";
-                    }
-                    break;
+            if (StringUtils.isNotEmpty(req.getRankSort())) {
+                switch (req.getRank()) {
+                    case "day":
+                        sort = " ret_1day " + req.getRankSort() + " , ";
+                        break;
+                    case "week":
+                        sort = " ret_1w " + req.getRankSort() + " , ";
+                        break;
+                    case "month":
+                        sort = " ret_1m " + req.getRankSort() + " , ";
+                        break;
+                    case "season":
+                        sort = " ret_3m " + req.getRankSort() + " , ";
+                        break;
+                    case "halfAYear":
+                        sort = " ret_6m " + req.getRankSort() + " , ";
+                        break;
+                    case "year":
+                        sort = " ret_1y " + req.getRankSort() + " , ";
+                        break;
+                    case "twoYear":
+                        sort = " ret_2y " + req.getRankSort() + " , ";
+                        break;
+                    case "threeYear":
+                        sort = " ret_3y " + req.getRankSort() + " , ";
+                        break;
+                    case "fiveYear":
+                        sort = " ret_5y " + req.getRankSort() + " , ";
+                        break;
+                    case "retIncep":
+                        sort = " ret_incep " + req.getRankSort() + " , ";
+                        break;
+                }
             }
 
             sort = sort + " net_nav ";