diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index 4d9136ea..92bce9ba 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -585,36 +585,42 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl taxnoMap = taxnoList.stream().collect(Collectors.toMap(SysDeptEntity::getDeptId, SysDeptEntity::getTaxno)); Map parentIdMap = parentIdList.stream().collect(Collectors.toMap(SysDeptEntity::getDeptId, e -> e.getParentId() == null ? "" : e.getParentId())); - log.info("taxnoMap={},parentIdMap={}",taxnoMap,parentIdMap); + log.info("taxnoMap={},parentIdMap={}", taxnoMap, parentIdMap); String gfsh = ""; - for(String companyCode : companyCodes){ + for (String companyCode : companyCodes) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("org_code",companyCode); - SysDeptEntity sysDeptEntity = sysDeptAuthDao.selectOne(wrapper); - if(sysDeptEntity != null) { + wrapper.eq("org_code", companyCode); + List sysDeptEntityList = sysDeptAuthDao.selectList(wrapper); + SysDeptEntity sysDeptEntity = sysDeptEntityList.get(0); + if (sysDeptEntity != null) { String dId = sysDeptEntity.getDeptId(); - - gfsh = getGfsh(dId, taxnoMap, parentIdMap); - gfshList.add(gfsh); - log.info("获取的税号为:{}",gfsh); - + log.info("获取deptId为:{}", dId); + if (StringUtils.isNotEmpty(dId)) { + gfsh = getGfsh(dId, taxnoMap, parentIdMap); + if (StringUtils.isNotEmpty(gfsh)) + gfshList.add(gfsh); + log.info("获取的税号为:{}", gfsh); + } } } - log.info("购方税号list为:{}",gfshList); + log.info("购方税号list为:{}", gfshList); return gfshList; } - private String getGfsh(String deptId,Map taxnoMap,Map parentIdMap) { - log.info("deptId={}",deptId); - String taxno = taxnoMap.get(deptId); + private String getGfsh(String deptId, Map taxnoMap, Map parentIdMap) { + String taxno = ""; + if (StringUtils.isNotEmpty(deptId)) { + log.info("deptId={}", deptId); + taxno = taxnoMap.get(deptId); - if(StringUtils.isEmpty(taxno)){ - deptId = parentIdMap.get(deptId); - log.info("获取map中的deptId:{}",deptId); - getGfsh(deptId,taxnoMap,parentIdMap); + if (StringUtils.isEmpty(taxno)) { + deptId = parentIdMap.get(deptId); + log.info("获取map中的deptId:{}", deptId); + getGfsh(deptId, taxnoMap, parentIdMap); + } } return taxno; }