feat: 前台分类排序

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/controller/frontend/DiyTypeController.java

@@ -64,9 +64,11 @@ public class DiyTypeController {
         diyTypeLambdaQueryWrapper1.eq(DiyType::getParentId, dt.getId());
         diyTypeLambdaQueryWrapper1.eq(DiyType::getStatus, DiyTypeStatusEnum.STATUS_1.getCode());
         if (num == null) {
-            PageHelper.orderBy("sort desc,createdTime desc");
+            //PageHelper.orderBy("sort desc,createdTime desc");
+            PageHelper.orderBy("sort asc");
         } else {
-            PageHelper.startPage(1, num, "sort desc,createdTime desc");
+            //PageHelper.startPage(1, num, "sort desc,createdTime desc");
+            PageHelper.startPage(1, num, "sort asc");
         }
         List<DiyType> list = service.list(diyTypeLambdaQueryWrapper1);
         return CallBack.success(list);
@@ -82,9 +84,11 @@ public class DiyTypeController {
         diyTypeLambdaQueryWrapper.eq(DiyType::getParentId, id);
         diyTypeLambdaQueryWrapper.eq(DiyType::getStatus, DiyTypeStatusEnum.STATUS_1.getCode());
         if (num == null) {
-            PageHelper.orderBy("sort desc,createdTime desc");
+            //PageHelper.orderBy("sort desc,createdTime desc");
+            PageHelper.orderBy("sort asc");
         } else {
-            PageHelper.startPage(1, num, "sort desc,createdTime desc");
+            //PageHelper.startPage(1, num, "sort desc,createdTime desc");
+            PageHelper.startPage(1, num, "sort asc");
         }
         List<DiyType> list = service.list(diyTypeLambdaQueryWrapper);
         return CallBack.success(list);
@@ -95,7 +99,8 @@ public class DiyTypeController {
     public CallBack<List<DiyTypeVO>> tree() {
         LambdaQueryWrapper<DiyType> diyTypeLambdaQueryWrapper = new LambdaQueryWrapper<>();
         diyTypeLambdaQueryWrapper.eq(DiyType::getStatus, DiyTypeStatusEnum.STATUS_1.getCode());
-        PageHelper.orderBy("sort desc,createdTime desc");
+        //PageHelper.orderBy("sort desc,createdTime desc");
+        PageHelper.orderBy("sort asc");
         List<DiyType> list = service.list(diyTypeLambdaQueryWrapper);
         List<DiyTypeVO> voList = Copy.copyList(list, DiyTypeVO.class, obj -> obj.getParentId() == 0);
         tree(list, voList);
@@ -111,7 +116,8 @@ public class DiyTypeController {
         LambdaQueryWrapper<DiyType> diyTypeLambdaQueryWrapper = new LambdaQueryWrapper<>();
         diyTypeLambdaQueryWrapper.eq(DiyType::getStatus, DiyTypeStatusEnum.STATUS_1.getCode());
         diyTypeLambdaQueryWrapper.eq(DiyType::getDepartmentCode,"01");
-        PageHelper.orderBy("sort desc,createdTime desc");
+        //PageHelper.orderBy("sort desc,createdTime desc");
+        PageHelper.orderBy("sort asc");
         List<DiyType> list = service.list(diyTypeLambdaQueryWrapper);
         list.forEach(f -> {
             if (f.getParentId() != 0) {
@@ -144,7 +150,8 @@ public class DiyTypeController {
         diyTypeLambdaQueryWrapper1.eq(DiyType::getParentId, dt.getId());
         diyTypeLambdaQueryWrapper1.eq(DiyType::getStatus, DiyTypeStatusEnum.STATUS_1.getCode());
         diyTypeLambdaQueryWrapper1.eq(DiyType::getDepartmentCode, "01");
-        PageHelper.orderBy("sort desc,createdTime desc");
+        //PageHelper.orderBy("sort desc,createdTime desc");
+        PageHelper.orderBy("sort asc");
         List<DiyType> list = service.list(diyTypeLambdaQueryWrapper1);
         List<FgDiyTypeVo> voList = Copy.copyList(list, FgDiyTypeVo.class);
         voList.stream().forEach(vo -> {
@@ -163,7 +170,8 @@ public class DiyTypeController {
             LambdaQueryWrapper<DiyType> diyTypeLambdaQueryWrapper2 = new LambdaQueryWrapper<>();
             diyTypeLambdaQueryWrapper2.eq(DiyType::getParentId, vo.getId());
             diyTypeLambdaQueryWrapper2.eq(DiyType::getStatus, DiyTypeStatusEnum.STATUS_1.getCode());
-            PageHelper.orderBy("sort desc,createdTime desc");
+            //PageHelper.orderBy("sort desc,createdTime desc");
+            PageHelper.orderBy("sort asc");
             List<DiyType> ls = service.list(diyTypeLambdaQueryWrapper2);
             List<FgDiyTypeVo> voPage = Copy.copyList(ls, FgDiyTypeVo.class);
             vo.setChildren(voPage);