From c6acf648b8bcee16df04dcc26e146c5d2dfb00b4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 08 七月 2025 11:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java
index 9d74bd8..f6f10c9 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java
@@ -10,6 +10,7 @@
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.enums.MessageSplitTypeEnum;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
@@ -179,7 +180,8 @@
//涓婃姤鍘熷洜鍙戦�佹秷鎭粰纭浜�
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("璁惧鐘舵�侀暱鏃堕棿鏈彉鍖栧師鍥犱笂鎶ョ‘璁わ紒");
- messageDTO.setCategory("娑堟伅");
+ messageDTO.setMessageType(MessageSplitTypeEnum.statusPermanentlyNoChange.getType());
+ messageDTO.setCategory(MessageSplitTypeEnum.statusPermanentlyNoChange.getNote());
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
messageDTO.setFromUser(user.getUsername());
LoginUser userById = sysBaseApi.getUserById(approverId);
@@ -203,8 +205,9 @@
//涓婃姤鍘熷洜鍙戦�佹秷鎭粰纭浜�
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("璁惧鐘舵�佹秷鎭紒");
- messageDTO.setCategory("娑堟伅");
+ messageDTO.setCategory(MessageSplitTypeEnum.statusPermanentlyNoChange.getNote());
messageDTO.setFromUser("admin");
+ messageDTO.setMessageType(MessageSplitTypeEnum.statusPermanentlyNoChange.getType());
messageDTO.setToUser(mdcMessageApproval.getUpdateBy());
messageDTO.setContent("鎮ㄧ殑璁惧缂栧彿涓� [" + mdcMessageApproval.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏃堕棿鏈彉鍖栦笂鎶ュ凡琚澶囪秴绾х鐞嗗憳鎷掔粷锛岃閲嶆柊濉啓涓婃姤鍘熷洜锛�");
sysBaseApi.sendSysAnnouncement(messageDTO);
--
Gitblit v1.9.3