diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java index 4d48b54960..ab12b7bac2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java @@ -35,6 +35,10 @@ public class AgencyTreeResultDTO implements Serializable { * orgId-orgLevel */ private String orgLevel; + /** + * agencyId的全路径,包含自身 + */ + private String orgIdPath; /** * 下级机关组织 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 269898b5fd..882249b1ad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -622,7 +622,12 @@ ID AS agencyId, ORGANIZATION_NAME AS agencyName, PID, - LEVEL + LEVEL, + ( + case when pid is null or pid='0' or pid='' then id + else concat(pids,':',id) + end + )as orgIdPath from customer_agency where DEL_FLAG = 0 @@ -636,7 +641,12 @@ ID AS agencyId, ORGANIZATION_NAME AS agencyName, PID, - LEVEL + LEVEL, + ( + case when pid is null or pid='0' or pid='' then id + else concat(pids,':',id) + end + )as orgIdPath from customer_agency where