Merge branches '0630-增加权限筛选' and 'test' of http://192.168.12.182/invoice/pt into test

 Conflicts:

	dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java

dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java

@@ -269,8 +269,6 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
             }
             json.put("total", pageInfo.getTotal());
             json.put("datalist", voList);
-
-            log.info("总计耗时:{}",System.currentTimeMillis()-enter);
         } catch (Exception e) {
             // 统一设置操作异常标识
             log.info("错误信息为:{}",e.getMessage());
@@ -592,7 +590,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
         List<SysDeptEntity> parentIdList = sysDeptAuthDao.queryParentIdList();
 
         Map<String, String> taxnoMap = taxnoList.stream().collect(Collectors.toMap(SysDeptEntity::getDeptId, SysDeptEntity::getTaxno));
-        Map<String, String> parentIdMap = parentIdList.stream().collect(Collectors.toMap(SysDeptEntity::getDeptId, key2 -> key2.getParentId()==null?"":key2.getParentId()));
+        Map<String, String> parentIdMap = parentIdList.stream().collect(Collectors.toMap(SysDeptEntity::getDeptId, e -> e.getParentId() == null ? "" : e.getParentId()));
 
         log.info("taxnoMap={},parentIdMap={}",taxnoMap,parentIdMap);
 
@@ -605,20 +603,24 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                 String dId = sysDeptEntity.getDeptId();
                 log.info("获取deptId为:{}",dId);
                 gfsh = getGfsh(dId, taxnoMap, parentIdMap);
+                gfshList.add(gfsh);
+                log.info("获取的税号为：{}",gfsh);
+
             }
         }
-        log.info("购方税号为：{}",gfsh);
-        gfshList.add(gfsh);
+        log.info("购方税号list为：{}",gfshList);
+
 
         return gfshList;
     }
 
     private String getGfsh(String deptId,Map<String, String> taxnoMap,Map<String, String> parentIdMap) {
-
+        log.info("deptId={}",deptId);
         String taxno = taxnoMap.get(deptId);
 
         if(StringUtils.isEmpty(taxno)){
             deptId = parentIdMap.get(deptId);
+            log.info("获取map中的deptId:{}",deptId);
             getGfsh(deptId,taxnoMap,parentIdMap);
         }
         return taxno;