From ae169f212e96590e11e78e0f5e591cdb6b818e9d Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Fri, 16 Aug 2024 14:41:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coal/empSalary/service/EmpSalaryService.java       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/empSalary/service/EmpSalaryService.java b/src/main/java/cn/lihongjie/coal/empSalary/service/EmpSalaryService.java
index 5fd0714b..972da98a 100644
--- a/src/main/java/cn/lihongjie/coal/empSalary/service/EmpSalaryService.java
+++ b/src/main/java/cn/lihongjie/coal/empSalary/service/EmpSalaryService.java
@@ -124,12 +124,13 @@ public class EmpSalaryService extends BaseService<EmpSalaryEntity, EmpSalaryRepo
         EmpSalaryBatchEntity batch = batchService.get(dto.getBatchId());
         assertBatchEditable(batch);
 
-        RLock lock = redissonClient.getLock("batchModify." + batch.getId());
+        @Cleanup("unlock") RLock lock = redissonClient.getLock("batchModify." + batch.getId());
 
         boolean tryLock = lock.tryLock();
 
         if (!tryLock) {
             batchModifing(batch);
+            lock = null;
         }
 
         if (org.apache.commons.collections4.MapUtils.isEmpty(dto.getSalaryItems())) {
@@ -822,14 +823,17 @@ select id from tmp1 where rk = 1
 
         assertBatchEditable(batch);
 
-        RLock lock = redissonClient.getLock("batchModify." + batch.getId());
+        @Cleanup("unlock") RLock lock = redissonClient.getLock("batchModify." + batch.getId());
 
         boolean tryLock = lock.tryLock();
 
         if (!tryLock) {
+            lock = null;
             batchModifing(batch);
         }
 
+
+
         List<EmpSalaryItemEntity> items =
                 this.empSalaryItemService.getItems(batch.getOrganizationId());
 
@@ -854,7 +858,7 @@ select id from tmp1 where rk = 1
                                 if (header.equals("身份证号") || header.equals("身份证")) {
                                     object.put("idCard", value);
 
-                                } else if (StringUtils.equalsAny("姓名", "部门", "岗位")) {
+                                } else if (StringUtils.equalsAny("姓名","员工", "部门", "岗位")) {
 
                                     // 忽略这些字段