项目列表接口开发

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -266,10 +266,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             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) : "");
+            deptNames += (StringUtils.isNotEmpty(completeDept.getGrid()) ? completeDept.getGrid() : "");
+            deptIds += (completeDept.getGridId()!=null && completeDept.getGridId()!= 0 ? completeDept.getGridId().toString() : "");
+            parentAndAllDeptDTO.setAllDeptIds(deptIds);
+            parentAndAllDeptDTO.setAllDeptNames(deptNames);
         } else {
             return new Result().error("部门Id错误");
         }