|
|
@ -261,8 +261,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
deptNames += (StringUtils.isNotEmpty(completeDept.getStreet()) ? completeDept.getStreet() +"-": ""); |
|
|
deptNames += (StringUtils.isNotEmpty(completeDept.getStreet()) ? completeDept.getStreet() +"-": ""); |
|
|
deptNames += (StringUtils.isNotEmpty(completeDept.getCommunity()) ? "-"+completeDept.getCommunity() +"-": ""); |
|
|
deptNames += (StringUtils.isNotEmpty(completeDept.getCommunity()) ? "-"+completeDept.getCommunity() +"-": ""); |
|
|
String deptIds = (completeDept.getDistrictId()!=null && completeDept.getDistrictId()!= 0 ? completeDept.getDistrictId().toString() +"," : ""); |
|
|
String deptIds = (completeDept.getDistrictId()!=null && completeDept.getDistrictId()!= 0 ? completeDept.getDistrictId().toString() +"," : ""); |
|
|
deptIds += (completeDept.getStreetId()!=null && completeDept.getStreetId()!= 0 ? ","+ completeDept.getStreetId().toString() +",": ""); |
|
|
deptIds += (completeDept.getStreetId()!=null && completeDept.getStreetId()!= 0 ? completeDept.getStreetId().toString() +",": ""); |
|
|
deptIds += (completeDept.getCommunityId()!=null && completeDept.getCommunityId()!= 0 ? ","+ completeDept.getCommunityId().toString() +"," : ""); |
|
|
deptIds += (completeDept.getCommunityId()!=null && completeDept.getCommunityId()!= 0 ? completeDept.getCommunityId().toString() +"," : ""); |
|
|
parentAndAllDeptDTO.setParentDeptIds(!"".equals(deptIds)? deptIds.substring(0,deptIds.length()-1) : ""); |
|
|
parentAndAllDeptDTO.setParentDeptIds(!"".equals(deptIds)? deptIds.substring(0,deptIds.length()-1) : ""); |
|
|
parentAndAllDeptDTO.setParentDeptNames(!"".equals(deptNames)? deptNames.substring(0,deptNames.length()-1) : ""); |
|
|
parentAndAllDeptDTO.setParentDeptNames(!"".equals(deptNames)? deptNames.substring(0,deptNames.length()-1) : ""); |
|
|
// 所有部门(包含街道、社区、网格)
|
|
|
// 所有部门(包含街道、社区、网格)
|
|
|
|