feat: 列表 page 对象格式调整

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java

@@ -199,7 +199,7 @@ public class WelcomeController extends WebBaseController {
      * @date : 2022/2/11
      */
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public RestResponse<PageResult2<WelcomeListDTO>> listWelcome(@RequestBody @Valid ListWelcomeQO qo) {
+    public RestResponse<Page<WelcomeListDTO>> listWelcome(@RequestBody @Valid ListWelcomeQO qo) {
         QueryWelcomeQDTO queryWelcomeQDTO = new QueryWelcomeQDTO();
         queryWelcomeQDTO.setTitle(qo.getTitle());
         queryWelcomeQDTO.setWxEnterpriseId(qo.getWxEnterpriseId());
@@ -210,9 +210,7 @@ public class WelcomeController extends WebBaseController {
             queryWelcomeQDTO.setType(HmWelcomeType.NORMAL.getCode());
         }
         ServiceResponse<Page<WelcomeListDTO>> serviceResponse = welcomeApiService.listWelcomeWithCondition(queryWelcomeQDTO);
-        Page<WelcomeListDTO> result = serviceResponse.getResult();
-        PageResult2 pageInfo = PageUtil.getPageInfo(result);
-        return RestResponse.successResult(pageInfo);
+        return RestResponse.successResult(serviceResponse.getResult());
     }
 
     /**

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmGroupController.java

@@ -64,8 +64,7 @@ public class HmGroupController extends WebBaseController {
         hmGroupQueryDTO.setWxEnterpriseId(wxEnterpriseId);
         hmGroupQueryDTO.setEnterpriseId(enterpriseId);
         ServiceResponse<Page<HmGroupDTO>> serviceResponse = groupApiService.queryHmGroupSettingList(hmGroupQueryDTO);
-        PageResult2 pageInfo = PageUtil.getPageInfo(serviceResponse.getResult());
-        return RestResponse.successResult(pageInfo);
+        return RestResponse.successResult(serviceResponse.getResult());
     }
 
     @RequestMapping(path = "/edit", method = RequestMethod.POST)

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmPageController.java

@@ -149,8 +149,7 @@ public class HmPageController {
         hmPageQDTO.setStartTime(pageListVO.getStartTime());
         hmPageQDTO.setEndTime(pageListVO.getEndTime());
         ServiceResponse<Page<HmPageDTO>> serviceResponse = pageApiService.queryPageList(hmPageQDTO);
-        PageResult2 pageInfo = PageUtil.getPageInfo(serviceResponse.getResult());
-        return RestResponse.successResult(pageInfo);
+        return RestResponse.successResult(serviceResponse.getResult());
     }
 
     @RequestMapping(path = "/page/delete")
@@ -185,7 +184,6 @@ public class HmPageController {
         pageRelationQueryDTO.setSearchText(pageRelationVO.getSearchContent());
         pageRelationQueryDTO.setPageId(pageRelationVO.getPageId());
         ServiceResponse<Page<HmPageRelationDTO>> serviceResponse = pageApiService.queryPageRelation(pageRelationQueryDTO);
-        PageResult2 pageInfo = PageUtil.getPageInfo(serviceResponse.getResult());
-        return RestResponse.successResult(pageInfo);
+        return RestResponse.successResult(serviceResponse.getResult());
     }
 }