From 6581e358babaed62c7bc1ababde0d4eb626ae72a Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 27 Feb 2025 18:41:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E8=A1=8C=E6=96=B0=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boot/manager/manager/utils/ImportNoPhotoExcelHelper.java  | 4 ----
 src/main/resources/mappers/wages/WagesMapper.xml              | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java b/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java
index f5947f0..226bc6d 100644
--- a/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java
+++ b/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java
@@ -115,10 +115,6 @@ public class ImportNoPhotoExcelHelper {
             if(Objects.equals(applyDateTitle,"申请时间")){
                 isNewModel = true;
                 colNum = sheet.getRow(12).getLastCellNum();
-                System.err.println(sheet.getRow(11).getLastCellNum());
-                System.err.println(sheet.getRow(12).getLastCellNum());
-                System.err.println(sheet.getRow(13).getLastCellNum());
-
             }else{
                 colNum = sheet.getRow(5).getLastCellNum();
             }
diff --git a/src/main/resources/mappers/wages/WagesMapper.xml b/src/main/resources/mappers/wages/WagesMapper.xml
index c4b83e4..76bbf7b 100644
--- a/src/main/resources/mappers/wages/WagesMapper.xml
+++ b/src/main/resources/mappers/wages/WagesMapper.xml
@@ -126,7 +126,7 @@
     </select>
 
     <select id="checkFile" resultType="com.bonus.boot.manager.wages.entity.WagesBean" parameterType="com.bonus.boot.manager.wages.entity.WagesBean">
-        select ID from vw_voucher_wages where FILE_NAME = #{fileName}
+        select ID from vw_voucher_wages where FILE_NAME = #{fileName} AND IS_ACTIVE = '1'
     </select>
     <select id="checkCCBWages" resultType="com.bonus.boot.manager.wages.entity.CCBWagesDetailsBean">
         select id from vw_wages_ccb_details where account_name = #{accountName} and account = #{account} and month =