diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java index 2631a14625..5a6d58d685 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.dto.result.OrgInfoIdAndNameResultDTO; import com.epmet.dto.result.OrgInfoResultDTO; import lombok.Data; @@ -77,5 +78,5 @@ public class CollectDetailResultDTO implements Serializable { private String orgIdPath; - private List orgIdPathList; + private List orgIdPathList; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.java similarity index 85% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.java index 0905a073b7..53223ed6ad 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.java @@ -14,7 +14,7 @@ import java.io.Serializable; @Data @NoArgsConstructor @AllArgsConstructor -public class OrgInfoResultDTO implements Serializable { +public class OrgInfoIdAndNameResultDTO implements Serializable { private static final long serialVersionUID = 7478605833438304330L; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 18c38f5407..c519210d7b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -226,13 +226,13 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl orgInfoList = new ArrayList<>(); + List orgInfoList = new ArrayList<>(); for (String orgId : split) { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); if (null == agencyInfo){ throw new EpmetException("查询组织信息失败:"+orgId); } - OrgInfoResultDTO orgInfoResultDTO = new OrgInfoResultDTO(orgId,agencyInfo.getOrganizationName()); + OrgInfoIdAndNameResultDTO orgInfoResultDTO = new OrgInfoIdAndNameResultDTO(orgId,agencyInfo.getOrganizationName()); orgInfoList.add(orgInfoResultDTO); } result.setOrgIdPathList(orgInfoList);