ariesy 增加非空税号

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

@@ -43,8 +43,8 @@ import com.github.pagehelper.PageInfo;
  * 手动勾选查询service实现类
  *
  * @author kangzq
- * @date 2019年5月11日
  * @version 1.0
+ * @date 2019年5月11日
  */
 @SuppressWarnings({"AlibabaLowerCamelCaseVariableNaming", "AlibabaUndefineMagicConstant", "AlibabaMethodTooLong"})
 @Slf4j
@@ -281,12 +281,9 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
     /**
      * 根据businessCode获取对应名称用于页面显示
      *
-     * @param businessCode
-     *            业务单元
-     * @param businessList
-     *            业务单元list
+     * @param businessCode 业务单元
+     * @param businessList 业务单元list
      * @return 返回
-     *
      */
     private String getBusinessName(String businessCode, List<Business> businessList) {
         String businessName = "";
@@ -494,7 +491,6 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
             }
 
 
-
             String hjsl = "0";
             String hjje = "0";
             String hjse = "0";
@@ -598,12 +594,14 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
         for (String companyCode : companyCodes) {
             QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
             wrapper.eq("org_code", companyCode);
-            SysDeptEntity sysDeptEntity = sysDeptAuthDao.selectOne(wrapper);
+            List<SysDeptEntity> sysDeptEntityList = sysDeptAuthDao.selectList(wrapper);
+            SysDeptEntity sysDeptEntity = sysDeptEntityList.get(0);
             if (sysDeptEntity != null) {
                 String dId = sysDeptEntity.getDeptId();
                 log.info("获取deptId为:{}", dId);
                 if (StringUtils.isNotEmpty(dId)) {
                     gfsh = getGfsh(dId, taxnoMap, parentIdMap);
+                    if (StringUtils.isNotEmpty(gfsh))
                         gfshList.add(gfsh);
                     log.info("获取的税号为：{}", gfsh);
                 }