Browse Source

1、调整web端居住社区名称显示方式;

master
luyan 1 year ago
parent
commit
3ebb01a869
  1. 11
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java

11
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java

@ -73,23 +73,14 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
} }
ParentAndAllDeptDTO deptDTO; ParentAndAllDeptDTO deptDTO;
if (entity.getShiBei() == 1) { 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());
}
} else {
String[] ids = entity.getAllDeptIds().split(","); String[] ids = entity.getAllDeptIds().split(",");
String deptId = ids.length == 4 ? ids[ids.length - 2] : ids[ids.length - 1]; String deptId = ids.length == 4 ? ids[ids.length - 1] : ids[ids.length - 1];
deptDTO = adminFeignClient.getParentAndAllDept(deptId).getData(); deptDTO = adminFeignClient.getParentAndAllDept(deptId).getData();
if (ids.length == 4) { if (ids.length == 4) {
dto.setParentDeptNames(deptDTO.getParentDeptNames()); dto.setParentDeptNames(deptDTO.getParentDeptNames());
} else { } else {
dto.setParentDeptNames(deptDTO.getAllDeptNames()); dto.setParentDeptNames(deptDTO.getAllDeptNames());
} }
}
} else { } else {
String[] villageNames = entity.getVillageName().split("-"); String[] villageNames = entity.getVillageName().split("-");
if (villageNames.length > 1) { if (villageNames.length > 1) {

Loading…
Cancel
Save