test

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

@@ -10,7 +10,6 @@ import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
@@ -61,8 +60,12 @@ public class GroupChatDataController {
         qdto.setWxEnterpriseId(wxEnterpriseId);
         ServiceResponse<Page<GroupChatDataDTO>> resp = this.groupChatDataApiService.listStaffData(qdto, basePageInfo);
         Page<GroupChatDataDTO> page = resp.getResult();
-        Page<GroupChatDataVO> retPage = PageHelperUtils.changePageHelperToCurrentPage(page.getResult(),
-                GroupChatDataVO.class);
+        List<GroupChatDataVO> list = EntityUtil.changeEntityListByJSON(GroupChatDataVO.class, page.getResult());
+        Page<GroupChatDataVO> retPage = new Page<>();
+        retPage.setTotalCount(page.getTotalCount());
+        retPage.setCurrentPage(page.getCurrentPage());
+        retPage.setPageSize(page.getPageSize());
+        retPage.setResult(list);
         return RestResponse.successResult(retPage);
     }