-

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();
     }

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();
+                }
             }
         });