列表网格名拼接到上两级组织名称，恶心人的玩意

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -233,6 +233,7 @@ public class GovOrgServiceImpl implements GovOrgService {
      **/
     @Override
     public List<CustomerGridDTO> gridListByStaffId(String staffId) {
+        //网格名是拼接上两级组织名称
         List<CustomerGridDTO> resultList = customerGridDao.gridListByStaffId(staffId);
         return resultList;
     }

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

@@ -56,10 +56,22 @@
         SELECT
             cg.id AS 'id',
             IF (
-                ca.organization_name = '',
+                ca.pid = '0',
-                cg.grid_name,
+                IF (
-                CONCAT(ca.organization_name,'-',cg.grid_name)
+                        ca.organization_name = '',
-            ) AS 'gridName'
+                        cg.grid_name,
+                        CONCAT(ca.organization_name,'-',cg.grid_name)
+                ),
+                CONCAT(
+                    (select organization_name from customer_agency where id = ca.pid),
+                    '-',
+                    IF (
+                        ca.organization_name = '',
+                        cg.grid_name,
+                        CONCAT(ca.organization_name,'-',cg.grid_name)
+                    )
+                )
+            )AS 'gridName'
         FROM
             customer_grid cg
         INNER JOIN customer_agency ca ON cg.pid = ca.id