ariesy 修改冲突bean

dxhy-base/src/main/java/com/dxhy/base/dao/SysDeptAuthDao.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @author jiaohongyang
  */
 @Mapper
-public interface SysDeptDao extends BaseMapper<SysDeptEntity> {
+public interface SysDeptAuthDao extends BaseMapper<SysDeptEntity> {
     /**
      * 根据集团编码查询税号
      *

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

@@ -9,7 +9,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
-import com.dxhy.base.dao.SysDeptDao;
+import com.dxhy.base.dao.SysDeptAuthDao;
 import com.dxhy.base.entity.SysDeptEntity;
 import com.dxhy.common.constant.DictConstant;
 import lombok.extern.slf4j.Slf4j;
@@ -56,7 +56,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
     @Resource
     private BaseTDxRecordInvoiceDao baseTDxRecordInvoiceDao;
     @Resource
-    private SysDeptDao sysDeptDao;
+    private SysDeptAuthDao sysDeptAuthDao;
     @Resource
     private DictdetaServcice dictdetaServcice;
     @Resource
@@ -579,17 +579,19 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
     @Override
     public List<String> getGfshList(List<String> gfshList, List<String> companyCodes) {
         DynamicContextHolder.push(DbConstant.BASICS_READ);
-        List<SysDeptEntity> taxnoList = sysDeptDao.queryTaxnoList();
+        List<SysDeptEntity> taxnoList = sysDeptAuthDao.queryTaxnoList();
-        List<SysDeptEntity> parentIdList = sysDeptDao.queryParentIdList();
+        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, SysDeptEntity::getParentId));
 
+        log.info("taxnoMap={},parentIdMap={}",taxnoMap,parentIdMap);
+
         String gfsh = "";
         for(String companyCode : companyCodes){
             QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
             wrapper.eq("org_code",companyCode);
-            SysDeptEntity sysDeptEntity = sysDeptDao.selectOne(wrapper);
+            SysDeptEntity sysDeptEntity = sysDeptAuthDao.selectOne(wrapper);
             String dId = sysDeptEntity.getDeptId();
 
             gfsh = getGfsh(dId,taxnoMap,parentIdMap);

dxhy-base/src/main/resources/mapper/SysDeptAuthDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.dxhy.base.dao.SysDeptDao">
+<mapper namespace="com.dxhy.base.dao.SysDeptAuthDao">
 
     <select id="queryList" resultType="com.dxhy.base.entity.SysDeptEntity">
         select t1.*,(select t2.name from sys_dept t2 where t2.dept_id=t1.parent_id)parentName from sys_dept t1