From e5e5c9dcae3fbdba8bcc6ab231ada6062e3b83c2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 28 Jul 2021 15:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 2 +- .../src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index da5a41d541..8cfe95113f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -345,7 +345,7 @@ public class GovOrgServiceImpl implements GovOrgService { resultDTO.setAgencyName(agencyDTO.getOrganizationName()); resultDTO.setOrgLevel(agencyDTO.getLevel()); resultDTO.setPid(agencyDTO.getPid()); - resultDTO.setPids(agencyDTO.getPids()); + resultDTO.setPids(("".equals(agencyDTO.getPids()) ? "0" : agencyDTO.getPids())); return resultDTO; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml index 404bc540c3..4ed6d3a2d1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml @@ -21,7 +21,7 @@ ca.id, ca.customer_id, ca.pid, - IF('' = ca.pids, '0', ca.pids) AS "pids" , + ca.pids AS "pids" , ca.all_parent_name, ca.organization_name, ca.level,