From 56e60425a0520734530e62e6d5d7653e7506f7be Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 15 Jul 2022 17:59:17 +0800 Subject: [PATCH] - --- .../java/com/epmet/controller/NeighborHoodController.java | 4 +++- .../java/com/epmet/controller/IcResiUserController.java | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java index e01d8cba4b..e6ad2250fb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java @@ -99,7 +99,9 @@ public class NeighborHoodController { lock = distributedLock.getLock(RedisKeys.getXiaoquEditLock(tokenDTO.getCustomerId()), 120L, 3L, TimeUnit.SECONDS); neighborHoodService.updateNeighborhood(customerId,formDTO); } finally { - lock.unlock(); + if (lock != null) { + lock.unlock(); + } } return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index ddd53b88b9..42dfbc7622 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -261,7 +261,9 @@ public class IcResiUserController implements ResultDataResolver { this.sendVolunteerMsg(tokenDto.getCustomerId(), resiUserId); } finally { - lock.unlock(); + if (lock != null) { + lock.unlock(); + } } return new Result(); } @@ -652,7 +654,9 @@ public class IcResiUserController implements ResultDataResolver { epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); //解锁 - lock.unlock(); + if (lock != null) { + lock.unlock(); + } } });