Browse Source

Revert "fix:工资导入时出现错误查询条件没加"

This reverts commit aa20edd0fe60204e84133feafba0104f083f5e9b.
ly 11 tháng trước cách đây
mục cha
commit
0967f72c00

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

@@ -146,7 +146,7 @@ public class BizFinancialSalaryServiceImpl extends ServiceImpl<BizFinancialSalar
                 //新增人员明细
                 bizFinancialSalaryDetailEmployeeMapper.insert(l);
                 successNum++;
-                successMsg.append("<br/>").append(successNum).append("、工资 ").append(l.getEmployeeName()).append(" 导入成功");
+                successMsg.append("<br/>").append(successNum).append("、工资 ").append(l.getCompanyName()).append(" 导入成功");
             }
         }
         if (failureNum > 0) {

+ 0 - 2
src/main/resources/mybatis/business/BizFinancialSalaryMapper.xml

@@ -41,8 +41,6 @@
 
             <if test="isStop != null ">AND is_stop = #{isStop}</if>
             <if test="companyName != null ">AND t2.name like concat('%', #{companyName}, '%')</if>
-            <if test="tenantId != null ">AND t1.tenant_id = #{tenantId}</if>
-            <if test="isZero != null ">AND t2.is_zero = #{isZero}</if>
             <if test="taxType != null and taxType != ''">
                 AND t2.tax_type = #{taxType}
             </if>