fix:工资导入时出现错误添加查询方法

src/main/java/cn/ezhizao/project/business/salary/mapper/BizFinancialSalaryMapper.java

@@ -30,4 +30,5 @@ public interface BizFinancialSalaryMapper extends BaseMapper<BizFinancialSalary>
     int physicalDeleteIds(List<Long> ids);
 
     List<BizFinancialSalary> getList2(BizFinancialSalary bizFinancialSalary);
+    public List<BizFinancialSalary> getSalary(BizFinancialSalary bizFinancialSalary);
 }

src/main/java/cn/ezhizao/project/business/salary/service/impl/BizFinancialSalaryServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
+import javax.swing.text.TabExpander;
 
 import cn.ezhizao.common.exception.ServiceException;
 import cn.ezhizao.common.utils.StringUtils;
@@ -90,7 +91,7 @@ public class BizFinancialSalaryServiceImpl extends ServiceImpl<BizFinancialSalar
             salary.setCompanyName(salaryDetai.getCompanyName());
             salary.setTenantId(tenantId);
             salary.setIsZero(isZero);
-            List<BizFinancialSalary> salaryList = getList(salary);
+            List<BizFinancialSalary> salaryList = bizFinancialSalaryMapper.getSalary(salary);
             //是否存在该客户
             if (salaryList.size() == 0) {
                 failureNum++;
@@ -146,7 +147,7 @@ public class BizFinancialSalaryServiceImpl extends ServiceImpl<BizFinancialSalar
                 //新增人员明细
                 bizFinancialSalaryDetailEmployeeMapper.insert(l);
                 successNum++;
-                successMsg.append("<br/>").append(successNum).append("、工资 ").append(l.getCompanyName()).append(" 导入成功");
+                successMsg.append("<br/>").append(successNum).append("、工资 ").append(l.getEmployeeName()).append(" 导入成功");
             }
         }
         if (failureNum > 0) {

src/main/resources/mybatis/business/BizFinancialSalaryMapper.xml

@@ -204,4 +204,15 @@
             </if>
         </trim>
     </delete>
+    <select id="getSalary" resultType="cn.ezhizao.project.business.salary.domain.BizFinancialSalary">
+        SELECT *
+        FROM biz_financial_salary salary
+            left join biz_company company on company.id = salary.company_id
+        <where>
+            salary.deleted = 0
+            <if test="companyName != null ">AND company.name like concat('%', #{companyName}, '%')</if>
+            <if test="tenantId != null ">AND salary.tenant_id = #{tenantId}</if>
+            <if test="isZero != null ">AND company.is_zero = #{isZero}</if>
+        </where>
+    </select>
 </mapper>