diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index ed2c71ba..fafc5521 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -7,7 +7,7 @@ SELECT sd.`id` AS agencyId, if(sd.`name` = '锦水街道办事处','锦水街道',sd.`name`) AS agencyName, if(sd.type_key='street_party',0,sd.`pid` )pid, - if(sd.type_key='street_party',0, SUBSTRING_INDEX(sd.pids, ',', -1) )pids, + if(sd.type_key='street_party',0,sd.`pids` )pids, CASE WHEN sd2.`name` IS NULL AND sd1.`name` IS NULL THEN sd.`name` WHEN sd2.`name` IS NULL THEN CONCAT(sd1.`name`, '-', sd.`name`) ELSE CONCAT(IFNULL(sd2.`name`, ''), '-', IFNULL(sd1.`name`, ''), '-', sd.`name`) END AS allParentNames, '' AS areaMarks, @@ -32,7 +32,7 @@ SELECT sd.`id` AS gridId, sd.`name` AS gridName, sd.`pid` AS parentAgencyId, - SUBSTRING_INDEX(sd.pids, ',', -1) AS allParentIds, + sd.`pids` AS allParentIds, '' AS areaMarks, '' AS centerMark, '' AS partyMark,