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("-");