|
|
@ -1017,11 +1017,15 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit |
|
|
|
} |
|
|
|
for (SubOrgResDTO org : subOrgListRes.getData()) { |
|
|
|
IcEventAnalysisOrgResDTO resultDto = ConvertUtils.sourceToTarget(org, IcEventAnalysisOrgResDTO.class); |
|
|
|
String purePids = org.getPids(); |
|
|
|
if ("0".equals(purePids) || StringUtils.isBlank(purePids)) { |
|
|
|
formDTO.setGridPids(org.getOrgId()); |
|
|
|
} else { |
|
|
|
formDTO.setGridPids(purePids.concat(":").concat(org.getOrgId())); |
|
|
|
formDTO.setOrgId(org.getOrgId()); |
|
|
|
formDTO.setOrgType(org.getOrgType()); |
|
|
|
if("agency".equals(org.getOrgType())){ |
|
|
|
String purePids = org.getPids(); |
|
|
|
if ("0".equals(purePids) || StringUtils.isBlank(purePids)) { |
|
|
|
formDTO.setGridPids(org.getOrgId()); |
|
|
|
} else { |
|
|
|
formDTO.setGridPids(purePids.concat(":").concat(org.getOrgId())); |
|
|
|
} |
|
|
|
} |
|
|
|
resultDto.setTotal(baseDao.selectOrgTotal(formDTO)); |
|
|
|
list.add(resultDto); |
|
|
|