Merge remote-tracking branch 'remotes/origin/master' into dev_compare_data

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java

@@ -73,4 +73,6 @@ public class CollectDetailResultDTO implements Serializable {
     private String checkReason;
 
     private List<IcResiCollectMemDetailDTO> memberList;
+
+    private String orgIdPath;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java

@@ -224,6 +224,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "暂无查询到信息","暂无查询到信息");
         }
         CollectDetailResultDTO result = ConvertUtils.sourceToTarget(entity, CollectDetailResultDTO.class);
+        result.setOrgIdPath(StringUtils.isBlank(entity.getPids()) ? entity.getAgencyId() : entity.getPids()+":"+entity.getAgencyId());
         //查询成员信息
         List<IcResiCollectMemDetailDTO> memberList = icResiMemberDao.selectListByCollectId(dto.getId());
         result.setMemberList(memberList);