|
|
|
@ -1591,10 +1591,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
|
} else if (StringUtils.isNotEmpty(tempName) && tempName.equals(key)) { |
|
|
|
sort++; |
|
|
|
} else { |
|
|
|
tempName = key; |
|
|
|
sort = 0; |
|
|
|
} |
|
|
|
if (null != deptMap.get(key)) { |
|
|
|
String streetName = key.length() == 4 ? deptMap.get(key).getParentName().concat(key) : key; |
|
|
|
String streetName = key; |
|
|
|
if (streetName.equals(ex.getStreetName().concat(ex.getGridName()))) { |
|
|
|
SysDeptEntity entity = new SysDeptEntity(); |
|
|
|
entity.setName(streetName.concat(ex.getName())); |
|
|
|
|