diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitListbriefFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitListbriefFormDTO.java index a59a6515b3..899ba36866 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitListbriefFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitListbriefFormDTO.java @@ -31,7 +31,7 @@ public class PartyUnitListbriefFormDTO implements Serializable { /** * 网格id */ - private String gridId; +// private String gridId; /** * 组织id diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListbrieResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListbrieResultDTO.java index e4eef93ec1..eadc99ca2a 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListbrieResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListbrieResultDTO.java @@ -21,12 +21,12 @@ public class PartyUnitListbrieResultDTO implements Serializable { /** * 所属网格 */ - private String gridName; +// private String gridName; /** * 所属网格id */ - private String gridId; +// private String gridId; /** * 分类 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 5276e1352d..8f2db1e2ad 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -603,14 +603,14 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl dto = baseDao.getListbrief(form, form.getCustomerId()); // 获取gridName - for (PartyUnitListbrieResultDTO item : dto) { + /*for (PartyUnitListbrieResultDTO item : dto) { if (StringUtils.isNotEmpty(item.getGridId())) { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId()); if (null != gridInfo) { item.setGridName(gridInfo.getGridName()); } } - } + }*/ PageInfo info = new PageInfo<>(dto); return new PageData<>(dto, info.getTotal()); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml index c898ec9f5d..9a25ea4906 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml @@ -76,34 +76,34 @@