Merge branch 'v1.3.0-release' of github.com:ZhouYixun/sonic-server in…

…to v1.3.0-release
SonicCloudOrg · Jan 19, 2022 · 9368e05 · 9368e05
2 parents 31e6135 + 03fd8db
commit 9368e05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...r-controller/src/main/java/org/cloud/sonic/controller/services/impl/StepsServiceImpl.java b/...r-controller/src/main/java/org/cloud/sonic/controller/services/impl/StepsServiceImpl.java
@@ -121,6 +121,7 @@ public void sortSteps(StepSort stepSort) {
                 .le(Steps::getSort, stepSort.getStartId())
                 // >=
                 .ge(Steps::getSort, stepSort.getEndId())
+                .orderByAsc(Steps::getSort)
                 .list();
 
         if (stepSort.getDirection().equals("down")) {

diff --git a/...ntroller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java b/...ntroller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java
@@ -108,7 +108,7 @@ public JSONObject findSteps(int id) {
             Map<String, List<String>> valueMap = new HashMap<>();
             for (GlobalParams g : globalParamsList) {
                 if (g.getParamsValue().contains("|")) {
-                    List<String> shuffle = Arrays.asList(g.getParamsValue().split("|"));
+                    List<String> shuffle = Arrays.asList(g.getParamsValue().split("\\|"));
                     Collections.shuffle(shuffle);
                     valueMap.put(g.getParamsKey(), shuffle);
                 } else {