Merge remote-tracking branch 'origin/develop' into develop

4 years ago · e9116ea004
1 changed files with 1 additions and 1 deletions
--- 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,
-            ca.pids,
+            IF('' = ca.pids, '0', ca.pids),
            ca.all_parent_name,
            ca.organization_name,
            ca.level,