组织树

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml

@@ -165,7 +165,7 @@
                 ID AS orgId,
                 ORGANIZATION_NAME AS orgName,
                 'agency' AS orgType,
-                CONCAT( PIDS, ID ) AS orgPids
+                IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids
             FROM
                 customer_agency a
             WHERE
@@ -175,7 +175,7 @@
                 cd.ID AS orgId,
                 DEPARTMENT_NAME AS orgName,
                 'dept' AS orgType,
-                CONCAT( PIDS, ca.ID, cd.ID ) AS orgPids
+                CONCAT( PIDS, ':', ca.ID, ':', cd.ID ) AS orgPids
             FROM
                 customer_department cd
                 INNER JOIN customer_agency ca ON cd.AGENCY_ID = ca.ID
@@ -186,7 +186,7 @@
                 ID AS orgId,
                 GRID_NAME AS orgName,
                 'grid' AS orgType,
-                CONCAT( PIDS, ID ) AS orgPids
+                CONCAT( PIDS,':', ID ) AS orgPids
             FROM
                 customer_grid
             WHERE
@@ -202,7 +202,7 @@
             ID AS orgId,
             ORGANIZATION_NAME AS orgName,
             'agency' AS orgType,
-            CONCAT(PIDS,ID) AS orgPids
+            IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids
 
         from
             customer_agency
@@ -228,7 +228,7 @@
                 ID AS orgId,
                 ORGANIZATION_NAME AS orgName,
                 'agency' AS orgType,
-                CONCAT( PIDS, ID ) AS orgPids
+                IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids
             FROM
                 customer_agency a
             WHERE
@@ -238,7 +238,7 @@
                 ID AS orgId,
                 GRID_NAME AS orgName,
                 'grid' AS orgType,
-                CONCAT( PIDS, ID ) AS orgPids
+                CONCAT( PIDS, ':', ID ) AS orgPids
             FROM
                 customer_grid
             WHERE
@@ -254,7 +254,7 @@
             ID AS orgId,
             ORGANIZATION_NAME AS orgName,
             'agency' AS orgType,
-            CONCAT(PIDS,ID) AS orgPids
+            IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids
 
         from
             customer_agency