Merge remote-tracking branch 'origin/dev_zhili'

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@@ -769,9 +769,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
     public PageData<CommunitySelfOrganizationListDTO> queryCoordinateList(CategorySelfOrgFormDTO formDTO) {
         CustomerStaffInfoCacheResult staffInfo=getStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId());
         formDTO.setAgencyId(staffInfo.getAgencyId());
-        PageInfo<CommunitySelfOrganizationListDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(),
+        List<CommunitySelfOrganizationListDTO> list=baseDao.queryCoordinateList(formDTO);
-                formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.queryCoordinateList(formDTO));
-        List<CommunitySelfOrganizationListDTO> list=pageInfo.getList();
         for (CommunitySelfOrganizationListDTO dto : list) {
             dto.setColor(SelfOrgCategoryEnum.getEnum(dto.getCategoryCode()).getColor());
             if (StringUtils.isNotBlank(dto.getCategoryCode())) {
@@ -779,7 +777,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
             }
 
         }
-        return new PageData<>(list, pageInfo.getTotal());
+        return new PageData<>(list, NumConstant.ONE_NEG);
     }
 
 }