From 7bcf345188b0bb8d0db5e358637ed4d01a1b3019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Fri, 29 Nov 2019 14:51:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/SysDeptServiceImpl.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 61d57a772..f21905f2b 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
@@ -261,15 +261,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             deptNames += (StringUtils.isNotEmpty(completeDept.getStreet()) ? completeDept.getStreet() +"-": "");
             deptNames += (StringUtils.isNotEmpty(completeDept.getCommunity()) ? "-"+completeDept.getCommunity() +"-": "");
             String deptIds = (completeDept.getDistrictId()!=null && completeDept.getDistrictId()!= 0 ? completeDept.getDistrictId().toString() +"," : "");
-            deptIds += (completeDept.getStreetId()!=null && completeDept.getStreetId()!= 0 ? ","+ completeDept.getStreetId().toString() +",": "");
-            deptIds += (completeDept.getCommunityId()!=null && completeDept.getCommunityId()!= 0 ? ","+ completeDept.getCommunityId().toString() +"," : "");
-            parentAndAllDeptDTO.setParentDeptIds(!"".equals(deptIds)? deptIds.substring(0,deptIds.length()-1):"");
-            parentAndAllDeptDTO.setParentDeptNames(!"".equals(deptNames)? deptNames.substring(0,deptNames.length()-1):"");
+            deptIds += (completeDept.getStreetId()!=null && completeDept.getStreetId()!= 0 ?  completeDept.getStreetId().toString() +",": "");
+            deptIds += (completeDept.getCommunityId()!=null && completeDept.getCommunityId()!= 0 ? completeDept.getCommunityId().toString() +"," : "");
+            parentAndAllDeptDTO.setParentDeptIds(!"".equals(deptIds)? deptIds.substring(0,deptIds.length()-1) : "");
+            parentAndAllDeptDTO.setParentDeptNames(!"".equals(deptNames)? deptNames.substring(0,deptNames.length()-1) : "");
             // 所有部门（包含街道、社区、网格）
             deptNames += (StringUtils.isNotEmpty(completeDept.getGrid()) ? completeDept.getGrid()+ "-" : "");
             deptIds += (completeDept.getGridId()!=null && completeDept.getGridId()!= 0 ? completeDept.getGridId().toString() + "," : "");
-            parentAndAllDeptDTO.setAllDeptIds(!"".equals(deptIds)? deptIds.substring(0,deptIds.length()-1):"");
-            parentAndAllDeptDTO.setAllDeptNames(!"".equals(deptNames)? deptNames.substring(0,deptNames.length()-1):"");
+            parentAndAllDeptDTO.setAllDeptIds(!"".equals(deptIds)? deptIds.substring(0,deptIds.length()-1) : "");
+            parentAndAllDeptDTO.setAllDeptNames(!"".equals(deptNames)? deptNames.substring(0,deptNames.length()-1) : "");
         } else {
             return new Result().error("部门Id错误");
         }