From 83c5fb3a0e4d62aaaebb2cf92e2286acf6cf0188 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Jun 2022 18:18:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=CB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 0d23fd40fa..7267860432 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -275,7 +275,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Override public PageData getHouseList(IcHouseListFormDTO formDTO) { - + if (StringUtils.isBlank(formDTO.getAgencyId())){ + formDTO.setAgencyId(formDTO.getId()); + } // 查询pids String pids = null; if (StringUtils.isNotBlank(formDTO.getAgencyId())) { From ee5ecdf20d46a143a1432163e8ad159e8f12ebfa Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 8 Jun 2022 18:37:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=CB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/HouseServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 7267860432..ada020d72c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -275,15 +275,14 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Override public PageData getHouseList(IcHouseListFormDTO formDTO) { - if (StringUtils.isBlank(formDTO.getAgencyId())){ - formDTO.setAgencyId(formDTO.getId()); - } // 查询pids String pids = null; - if (StringUtils.isNotBlank(formDTO.getAgencyId())) { - pids = getPids(formDTO.getAgencyId()); - } if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())){ + if (StringUtils.isBlank(formDTO.getAgencyId())){ + formDTO.setAgencyId(formDTO.getId()); + } + } + if (StringUtils.isNotBlank(formDTO.getAgencyId())) { pids = getPids(formDTO.getAgencyId()); } formDTO.setPids(pids); From 93ba905d12e6ac0697bfd004724f729a4d5517b2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 9 Jun 2022 09:20:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=CB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/IcHouseListFormDTO.java | 2 ++ .../java/com/epmet/controller/HouseController.java | 3 +++ .../com/epmet/service/impl/HouseServiceImpl.java | 13 +++++++------ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java index 8697f4b375..510b2cd744 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java @@ -89,4 +89,6 @@ public class IcHouseListFormDTO extends PageFormDTO { * 结束日期 eg：20220505 */ private String updateEndDate; + + private String selectType; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index c79551d32a..eddf5d0d05 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -98,6 +98,7 @@ public class HouseController implements ResultDataResolver { LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(loginUser, "【查询房屋】查询当前staff所在组织信息失败"); formDTO.setAgencyId(loginUserDetail.getAgencyId()); ValidatorUtils.validateEntity(formDTO); + formDTO.setSelectType("id"); return new Result().ok(houseService.getHouseList(formDTO)); } @@ -144,6 +145,7 @@ public class HouseController implements ResultDataResolver { formDTO.setAgencyId(loginUserDetail.getAgencyId()); formDTO.setBuildingName(buildingName); formDTO.setNeighborHoodName(neighborhoodName); + formDTO.setSelectType("agency"); return new Result>().ok(houseService.getHouseList(formDTO)); } @@ -351,6 +353,7 @@ public class HouseController implements ResultDataResolver { if (StringUtils.isBlank(formDTO.getAgencyId())){ LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(tokenDto, "【查询房屋】查询当前staff所在组织信息失败"); formDTO.setAgencyId(loginUserDetail.getAgencyId()); + formDTO.setSelectType("agency"); } ValidatorUtils.validateEntity(formDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index ada020d72c..4b17b95767 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -277,13 +277,14 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { public PageData getHouseList(IcHouseListFormDTO formDTO) { // 查询pids String pids = null; - if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())){ - if (StringUtils.isBlank(formDTO.getAgencyId())){ - formDTO.setAgencyId(formDTO.getId()); + if (StringUtils.isNotBlank(formDTO.getSelectType()) && formDTO.getSelectType().equals("agency")){ + if (StringUtils.isNotBlank(formDTO.getAgencyId())){ + pids = getPids(formDTO.getAgencyId()); + } + }else if (StringUtils.isNotBlank(formDTO.getSelectType()) && formDTO.getSelectType().equals("id")){ + if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())){ + pids = getPids(formDTO.getId()); } - } - if (StringUtils.isNotBlank(formDTO.getAgencyId())) { - pids = getPids(formDTO.getAgencyId()); } formDTO.setPids(pids); PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage())