diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index 333b3eb9d2..5fa092643e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -424,7 +424,8 @@ public class AgencyController { name = customerAgencyDTO.getOrganizationName(); //url组成:信息采集地址?社区id StringBuilder path = new StringBuilder(CollectUrlEnum.URL_PRE.getCode()); - path.append("?agencyId=").append(formDTO.getId()); + path.append("?agencyId=").append(formDTO.getId()) + .append("&agencyName=").append(name); //需要发送的Json JSONObject data = new JSONObject(); data.put("path", path.toString()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index 73dcd6f144..7b69614445 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -16,10 +16,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.NeighborhoodConstant; -import com.epmet.dao.CustomerGridDao; -import com.epmet.dao.IcNeighborHoodDao; -import com.epmet.dao.IcNeighborHoodPropertyDao; -import com.epmet.dao.IcOrganizationCodeInfoDao; +import com.epmet.dao.*; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.IcNeighborHoodPropertyDTO; @@ -30,10 +27,7 @@ import com.epmet.dto.form.IcUserBelongToChangedFormDTO; import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.dto.result.OrganizationCommunityDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcHouseEntity; -import com.epmet.entity.IcNeighborHoodEntity; -import com.epmet.entity.IcNeighborHoodPropertyEntity; -import com.epmet.entity.IcOrganizationCodeInfoEntity; +import com.epmet.entity.*; import com.epmet.enums.OrganizationTypeEnums; import com.epmet.excel.IcNeighborHoodExcel; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -85,6 +79,8 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl