From e9fe538b94f62ceeb26957d2db2d80817d237da0 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Sat, 8 Jul 2023 16:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E5=BE=AE?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 8c556f5d0..aa04e5989 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -1591,10 +1591,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                 } else if (StringUtils.isNotEmpty(tempName) && tempName.equals(key)) {
                     sort++;
                 } else {
+                    tempName = key;
                     sort = 0;
                 }
                 if (null != deptMap.get(key)) {
-                    String streetName = key.length() == 4 ? deptMap.get(key).getParentName().concat(key) : key;
+                    String streetName = key;
                     if (streetName.equals(ex.getStreetName().concat(ex.getGridName()))) {
                         SysDeptEntity entity = new SysDeptEntity();
                         entity.setName(streetName.concat(ex.getName()));