From ae9eeb9a952deef4d7f66eea60651d0f196dc535 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 14 Feb 2022 17:17:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=95=B0=E6=8D=AE=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=8E=A5=E5=8F=A3=20=E7=BB=84=E7=BB=87=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E6=8A=A5=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/screen/ScreenPublicDataDao.xml  | 4 ++--
 epdc-cloud-client-yushan                                      | 2 +-
 epdc-cloud-commons-yushan                                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
index eab21c7..57ccb41 100644
--- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
+++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
@@ -7,7 +7,7 @@
         SELECT sd.`id` AS agencyId,
                sd.`name` AS agencyName,
           case when sd.type_key = 'street_party' then 0 else sd.`pid` end AS pid,
-          case when sd.type_key = 'street_party' then 0 else sd.`pids` end AS pids,
+          case when sd.type_key = 'street_party' then 0 else SUBSTRING_INDEX(sd.pids, ',', -1) end AS 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,
-               sd.`pids` AS allParentIds,
+               SUBSTRING_INDEX(sd.pids, ',', -1) AS allParentIds,
                '' AS areaMarks,
                '' AS centerMark,
                '' AS partyMark,
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index 39a765c..d919a78 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit 39a765ce9d8a0ff9f4de4d045f2ce0332582bb53
+Subproject commit d919a78617e83128f5e69428e10e89d22e2e6968
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index 1f93308..99e4e9b 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit 1f93308c2985b4924ea280a3d79d567789c325b3
+Subproject commit 99e4e9b22ede63c92448a14fdd01c74894735411