From cf74cf76707710a08ffcdfc13c46706966f12803 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期四, 21 十一月 2024 17:35:45 +0800
Subject: [PATCH] 预警发送用户取当前人
---
src/main/java/com/product/administration/controller/EarlyWarningManagerController.java | 2 ++
src/main/java/com/product/administration/service/EarlyWarningManagerService.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/EarlyWarningManagerController.java b/src/main/java/com/product/administration/controller/EarlyWarningManagerController.java
index e61c244..29e0ed7 100644
--- a/src/main/java/com/product/administration/controller/EarlyWarningManagerController.java
+++ b/src/main/java/com/product/administration/controller/EarlyWarningManagerController.java
@@ -489,7 +489,9 @@
fse.setValue("createDate", new Date());
}
IPublicService publicService = (IPublicService) getProxyInstance(this.publicService);
+
publicService.saveFieldSetEntity(fse);
+
earlyWarningManagerService.sendWarnFeedBackMessage(fse);
return OK_List(earlyWarningManagerService.getWarnFeedBack(fse.getString("parent_uuid")));
} catch (BaseException e) {
diff --git a/src/main/java/com/product/administration/service/EarlyWarningManagerService.java b/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
index b14455f..971f0c0 100644
--- a/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
+++ b/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
@@ -338,6 +338,8 @@
StaffManagerService staffManagerService;
public void sendWarnFeedBackMessage(FieldSetEntity fse) throws BaseException {
+ String userId = String.valueOf(SpringMVCContextHolder.getCurrentUser().getUser_id());
+ fse.setValue( CmnConst.USER_ID,userId);//褰撳墠浜轰綔涓烘秷鎭彂閫佷汉锛屽叾瀹冮璀︽帴鏀朵汉浣滀负鏀舵秷鎭汉
String parent_uuid = fse.getString("puuid");
Set<String> receiverSet = this.getReceiver(fse.getString("parent_uuid"));
if (StringUtils.isEmpty(parent_uuid)) {
@@ -346,7 +348,6 @@
if (!StringUtils.isEmpty(leaderUserId)) {
receiverSet.add(leaderUserId);
}
- String userId = String.valueOf(SpringMVCContextHolder.getCurrentUser().getUser_id());
receiverSet.remove(userId);
if(receiverSet.isEmpty()){
logger.error("鍙戦�佹秷鎭�,澶辫触");
--
Gitblit v1.9.2