-

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java

@@ -99,8 +99,10 @@ public class NeighborHoodController {
             lock = distributedLock.getLock(RedisKeys.getXiaoquEditLock(tokenDTO.getCustomerId()), 120L, 3L, TimeUnit.SECONDS);
             neighborHoodService.updateNeighborhood(customerId,formDTO);
         } finally {
+            if (lock != null) {
                 lock.unlock();
             }
+        }
         return new Result();
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -261,8 +261,10 @@ public class IcResiUserController implements ResultDataResolver {
 
             this.sendVolunteerMsg(tokenDto.getCustomerId(), resiUserId);
         } finally {
+            if (lock != null) {
                 lock.unlock();
             }
+        }
         return new Result();
     }
 
@@ -652,8 +654,10 @@ public class IcResiUserController implements ResultDataResolver {
                 epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
 
                 //解锁
+                if (lock != null) {
                     lock.unlock();
                 }
+            }
         });
 
         return new Result();