...

cif-service/src/main/java/com/txz/cif/web/mng/QaController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.txz.cif.core.Result;
 import com.txz.cif.model.Qa;
 import com.txz.cif.model.QaGroup;
@@ -52,7 +53,7 @@ public class QaController {
                 .orderByDesc(QaGroup::getSort)
                 .orderByDesc(QaGroup::getUpdateTime)
         );
-        return Result.success(list);
+        return Result.success(new PageInfo(list));
     }
     
     
@@ -114,7 +115,7 @@ public class QaController {
     @GetMapping("availableGroupList")
     public Result<List<QaGroup>> availableGroupList() {
         List<QaGroup> list = qaGroupService.list(Wrappers.<QaGroup>lambdaQuery()
-                .eq(QaGroup::getDelFlag, Boolean.FALSE)
+                // .eq(QaGroup::getDelFlag, Boolean.FALSE)
         );
         return Result.success(list);
     }
@@ -125,7 +126,7 @@ public class QaController {
     @GetMapping("qaList")
     public Result<Page<QaListVO>> qaList(QaParam qaParam) {
         PageHelper.startPage(qaParam.getPage(), qaParam.getSize());
-        return Result.success(qaService.adminList(qaParam));
+        return Result.success(new PageInfo(qaService.adminList(qaParam)));
     }
     
     /**
@@ -171,6 +172,9 @@ public class QaController {
         return Result.success();
     }
     
+    /**
+     * qa详情
+     */
     @GetMapping("qaInfo/{id:^\\d+$}")
     public Result<Qa> qaInfo(@PathVariable Long id) {
         Qa qa = qaService.getById(id);

cif-service/src/main/java/com/txz/cif/web/mng/appcontroller/QaAppController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.txz.cif.core.Result;
 import com.txz.cif.model.Qa;
 import com.txz.cif.model.QaGroup;
@@ -66,7 +67,7 @@ public class QaAppController {
                 .orderByDesc(Qa::getSort)
                 .orderByDesc(Qa::getUpdateTime)
         );
-        return Result.success(list);
+        return Result.success(new PageInfo(list));
     }
     
     /**