yucheng 3 years ago
parent
commit
1a7e5cbf90

+ 1 - 3
dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/GraphDefineController.java

@@ -3,14 +3,12 @@ package com.persagy.dc.define.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dc.basic.model.QueryCriteria;
-import com.persagy.dc.basic.utils.DigitalCommonUtils;
 import com.persagy.dc.common.constant.ResponseCode;
 import com.persagy.dc.common.exception.BusinessException;
 import com.persagy.dc.common.model.response.CommonResult;
 import com.persagy.dc.common.model.response.PageList;
 import com.persagy.dc.common.utils.ResultHelper;
 import com.persagy.dc.define.entity.GraphDefine;
-import com.persagy.dc.define.entity.ObjectType;
 import com.persagy.dc.define.service.IGraphDefineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,7 +37,7 @@ public class GraphDefineController {
         // 转换查询条件
         criteria.toWrapper(wrapper);
         Page page = service.queryByCondition(criteria.toPage(), wrapper);
-        return ResultHelper.multi(page.getRecords());
+        return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 
     @PostMapping("/create")

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/ObjectInfoController.java

@@ -49,7 +49,7 @@ public class ObjectInfoController {
             wrapper.orderByAsc("show_order");
         }
         page = service.queryByCondition(criteria.toPage(), wrapper);
-        return ResultHelper.multi(page.getRecords());
+        return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 
     @PostMapping("/create")

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/RelationDefineController.java

@@ -41,7 +41,7 @@ public class RelationDefineController {
         // 转换查询条件
         criteria.toWrapper(wrapper);
         Page page = service.queryByCondition(criteria.toPage(), wrapper);
-        return ResultHelper.multi(page.getRecords());
+        return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 
     @PostMapping("/create")

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/controller/ObjectDigitalController.java

@@ -44,7 +44,7 @@ public class ObjectDigitalController {
         // 转换查询条件
         criteria.toWrapper(wrapper);
         Page page = service.queryByCondition(criteria.toPage(), wrapper);
-        return ResultHelper.multi(page.getRecords());
+        return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 
     @PostMapping("/create")

+ 1 - 1
dc-business/dc-digital/src/main/java/com/persagy/dc/digital/controller/ObjectRelationController.java

@@ -44,7 +44,7 @@ public class ObjectRelationController {
         // 转换查询条件
         criteria.toWrapper(wrapper);
         Page page = service.queryByCondition(criteria.toPage(), wrapper);
-        return ResultHelper.multi(page.getRecords());
+        return ResultHelper.multi(page.getRecords(), page.getTotal());
     }
 
     @PostMapping("/create")