From 3ebb01a8690236d6cd8b226c0f22e56b98bbff64 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Mon, 22 Apr 2024 17:15:52 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4web=E7=AB=AF?=
 =?UTF-8?q?=E5=B1=85=E4=BD=8F=E7=A4=BE=E5=8C=BA=E5=90=8D=E7=A7=B0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=96=B9=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ReportPartyServiceImpl.java  | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
index e883419ca..a16847166 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
@@ -73,22 +73,13 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
                     }
                     ParentAndAllDeptDTO deptDTO;
                     if (entity.getShiBei() == 1) {
-                        if (StringUtils.isNotEmpty(entity.getAllDeptNames())) {
-                            String[] names = entity.getAllDeptNames().split("-");
-                            if (names.length == 4) {
-                                dto.setParentDeptNames(entity.getAllDeptNames().substring(0, entity.getAllDeptNames().lastIndexOf("-")));
-                            } else {
-                                dto.setParentDeptNames(entity.getAllDeptNames());
-                            }
+                        String[] ids = entity.getAllDeptIds().split(",");
+                        String deptId = ids.length == 4 ? ids[ids.length - 1] : ids[ids.length - 1];
+                        deptDTO = adminFeignClient.getParentAndAllDept(deptId).getData();
+                        if (ids.length == 4) {
+                            dto.setParentDeptNames(deptDTO.getParentDeptNames());
                         } else {
-                            String[] ids = entity.getAllDeptIds().split(",");
-                            String deptId = ids.length == 4 ? ids[ids.length - 2] : ids[ids.length - 1];
-                            deptDTO = adminFeignClient.getParentAndAllDept(deptId).getData();
-                            if (ids.length == 4) {
-                                dto.setParentDeptNames(deptDTO.getParentDeptNames());
-                            } else {
-                                dto.setParentDeptNames(deptDTO.getAllDeptNames());
-                            }
+                            dto.setParentDeptNames(deptDTO.getAllDeptNames());
                         }
                     } else {
                         String[] villageNames = entity.getVillageName().split("-");