From 2e442f2c00682e1b7c29af2ce9c4c42fa2fdf9b5 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Mon, 27 Nov 2023 14:22:41 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=B7=B2=E8=AF=BB=E5=8A=9F=E8=83=BDbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/message/controller/MessagePushRecordController.java  | 2 +-
 .../hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessagePushRecordController.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessagePushRecordController.java
index e2a9b9e..b03f678 100644
--- a/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessagePushRecordController.java
+++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessagePushRecordController.java
@@ -90,7 +90,7 @@ public class MessagePushRecordController extends BladeController {
     @GetMapping("/readMessageBatch")
     @ApiOperation("批量处理消息")
     @ApiOperationSupport(order = 7)
-    public R<Boolean> readMessageBatch(String businessClassify,String type) {
+    public R<Boolean> readMessageBatch(@RequestParam(required = false) String businessClassify,@RequestParam(required = false) String type) {
         LambdaUpdateWrapper<MessagePushRecordEntity> eq = Wrappers.<MessagePushRecordEntity>lambdaUpdate()
                 .set(MessagePushRecordEntity::getStatus, MessageConstants.CONFIRM)
                 .set(MessagePushRecordEntity::getRespondTime, LocalDateTime.now())
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java
index ec5c331..a0de5f3 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java
@@ -61,7 +61,7 @@ public class OfflineTicketServiceImpl extends BaseServiceImpl<WorkTicketInfoMapp
     private final IWorkTicketContentService contentService;
     private final IUserClient userClient;
     private final IWorkTicketFlowService workTicketFlowService;
-    private Lock lock = new ReentrantLock();
+    private static Lock lock = new ReentrantLock();
 
     /**
      * 线下工作票开票