From 146d4a453f743c9a58d9ca444b7c495255b413c4 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Mon, 11 Dec 2023 16:58:09 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=20suo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/wms/common/util/RedissonUtils.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/common/util/RedissonUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/common/util/RedissonUtils.java
index a8b38bac..542b2d74 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/common/util/RedissonUtils.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/common/util/RedissonUtils.java
@@ -38,8 +38,12 @@ public class RedissonUtils {
                 throw new BadRequestException("当前业务正在执行:"+key+",稍后再试");
             }
         }finally {
-            if (isLock){
-                lock.unlock();
+            if (isLock && lock.isHeldByCurrentThread()){
+                try {
+                    lock.unlock();
+                }catch (Exception ex){
+                    System.out.println("redisson锁释放失败"+ex.getMessage());
+                }
             }
         }
     }