|
@ -319,7 +319,7 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo |
|
|
ReportPartyEntity entity = ConvertUtils.sourceToTarget(dto, ReportPartyEntity.class); |
|
|
ReportPartyEntity entity = ConvertUtils.sourceToTarget(dto, ReportPartyEntity.class); |
|
|
//市北居住处理居住社区信息
|
|
|
//市北居住处理居住社区信息
|
|
|
if (null != dto.getAllDeptIds() && dto.getShiBei() == 1) { |
|
|
if (null != dto.getAllDeptIds() && dto.getShiBei() == 1) { |
|
|
if (entity.getCouplingCommunity().length() == 4) { |
|
|
if (dto.getCouplingCommunity().length == 4) { |
|
|
entity.setDeptId(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 2]); |
|
|
entity.setDeptId(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 2]); |
|
|
} else { |
|
|
} else { |
|
|
entity.setDeptId(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 1]); |
|
|
entity.setDeptId(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 1]); |
|
@ -336,7 +336,7 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo |
|
|
} |
|
|
} |
|
|
} else {//不在市北,处理居住信息
|
|
|
} else {//不在市北,处理居住信息
|
|
|
if (StringUtils.isNotEmpty(dto.getVillageName())) { |
|
|
if (StringUtils.isNotEmpty(dto.getVillageName())) { |
|
|
if (entity.getCouplingCommunity().length() == 4) { |
|
|
if (dto.getCouplingCommunity().length == 4) { |
|
|
entity.setDeptId(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 2]); |
|
|
entity.setDeptId(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 2]); |
|
|
} else { |
|
|
} else { |
|
|
entity.setDeptId(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 1]); |
|
|
entity.setDeptId(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 1]); |
|
|