From af12686a8582e5a34a80a8a898c8d22a75b13365 Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Fri, 17 Dec 2021 10:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/data/controller/PayCaseCommitteeSubitemController.java | 2 +-
 .../jero/data/controller/PayCaseCouncilSubitemController.java   | 2 +-
 .../com/jero/system/controller/SystemSendMessageController.java | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
index 996030f9..4d5749a3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
@@ -277,7 +277,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 			paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
 			JSONObject json = new JSONObject();
 			json.put("type","7");// 7为分标委项目
-			json.put("id",payCaseCommitteeSubitem.getId());
+			json.put("id",payCaseCommittee.getId());
 			json.put("abbreviation",payCaseCommittee.getAbbreviation());
 			json.put("path","/subBidCommittee/SubBidCommitteeDetailPage");
 			paySendContactsMessageDTO.setJson(json);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
index 52619d94..3bea69b6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
@@ -180,7 +180,7 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
 			 paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
 			 JSONObject json = new JSONObject();
 			 json.put("type","8"); // 8为理事会项目
-			 json.put("id",payCaseCouncilSubitem.getId());
+			 json.put("id",payCaseCouncil.getId());
 			 json.put("path","/standardsAssociation/CouncilDetailPage");
 			 paySendContactsMessageDTO.setJson(json);
 			 contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java
index 8dfce3f1..38c7c82d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java
@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.env.Environment;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.Date;
@@ -66,6 +67,7 @@ public class SystemSendMessageController {
     @ApiOperation(value="发送站内消息", notes="发送站内消息")
     @PostMapping(value = "/sendAllUserMessage")
 //    @RequiresPermissions("system:dept:save")
+    @Transactional
     public Result<?> sendAllUserMessage(@RequestParam("content") String content) {
         List<PayContactsManagement> listPayContactsManagement = payContactsManagementService.list();
         if(!CollectionUtils.isEmpty(listPayContactsManagement)){