fengji 团练宝缴费激活

mec-web/src/main/java/com/ym/mec/web/controller/SysManualController.java

@@ -1,9 +1,14 @@
 package com.ym.mec.web.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ym.mec.biz.dal.entity.SysManual;
+import com.ym.mec.biz.dal.entity.TenantOrderRecord;
 import com.ym.mec.biz.dal.page.SysManualQueryInfo;
 import com.ym.mec.biz.service.SysManualService;
+import com.ym.mec.common.page.PageUtil;
+import com.ym.mec.common.page.WrapperUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,19 +37,16 @@ public class SysManualController extends BaseController {
     @ApiOperation(value = "查询操作手册")
     @RequestMapping("/list")
     public Object list(SysManualQueryInfo queryInfo) {
-        QueryWrapper<SysManual> queryWrapper = null;
-        if (queryInfo.getMenuId() != null) {
-            queryWrapper = new QueryWrapper<SysManual>().eq("menu_id_", queryInfo.getMenuId());
-        } else {
-            queryWrapper = new QueryWrapper<>();
-        }
-        List<SysManual> result = sysManualService.list(queryWrapper);
-        return succeed(result);
+
+        QueryWrapper<SysManual> queryWrapper = new WrapperUtil<SysManual>().hasEq("menu_id_", queryInfo.getMenuId()).queryWrapper();
+        Page<SysManual> pageInfo = PageUtil.getPage(queryInfo.getPage(), queryInfo.getRows());
+
+        return PageUtil.pageInfo(sysManualService.page(pageInfo, queryWrapper));
     }
 
     @ApiOperation(value = "新增帮助手册")
     @PostMapping("/add")
-    public Object add(@RequestBody SysManual sysManual) throws Exception{
+    public Object add(@RequestBody SysManual sysManual) throws Exception {
         this.check(sysManual);
         sysManualService.save(sysManual);
         return succeed();
@@ -52,7 +54,7 @@ public class SysManualController extends BaseController {
 
     @ApiOperation(value = "修改帮助手册")
     @PostMapping("/update")
-    public Object update(@RequestBody SysManual sysManual) throws Exception{
+    public Object update(@RequestBody SysManual sysManual) throws Exception {
         this.check(sysManual);
         if (sysManual.getId() == null) {
             throw new Exception("更新必须有id");
@@ -87,7 +89,7 @@ public class SysManualController extends BaseController {
 
     @ApiOperation(value = "删除帮助手册")
     @PostMapping("/remove")
-    public Object remove(@RequestBody SysManual sysManual) throws Exception{
+    public Object remove(@RequestBody SysManual sysManual) throws Exception {
         sysManualService.removeById(sysManual.getId());
         return succeed();
     }