From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java
index 0365861..be109e2 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java
@@ -52,20 +52,25 @@
@Override
public boolean add(MdcMessageApproval mdcMessageApproval) {
- boolean result = false;
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- mdcMessageApproval.setSenderIds(user.getId());
- mdcMessageApproval.setSenderNames(user.getRealname());
- // 鏌ヨ璁惧瓒呯骇绠＄悊鍛�
- List<SysUser> superList = sysUserService.getEquipmentAdmin(MdcConstant.MDC_EQUIPMENT_SUPER_MANAGER, mdcMessageApproval.getEquipmentId());
- if (superList != null && !superList.isEmpty()) {
- List<String> superIdList = superList.stream().map(SysUser::getId).collect(Collectors.toList());
- mdcMessageApproval.setApproverIds(String.join(",", superIdList));
- List<String> superNameList = superList.stream().map(SysUser::getRealname).collect(Collectors.toList());
- mdcMessageApproval.setApproverNames(String.join(",", superNameList));
+ try {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ mdcMessageApproval.setSenderIds(user.getId());
+ mdcMessageApproval.setSenderNames(user.getRealname());
+ // 鏌ヨ璁惧瓒呯骇绠＄悊鍛�
+ List<SysUser> superList = sysUserService.getEquipmentAdmin(MdcConstant.MDC_EQUIPMENT_SUPER_MANAGER, mdcMessageApproval.getEquipmentId());
+ if (superList != null && !superList.isEmpty()) {
+ List<String> superIdList = superList.stream().map(SysUser::getId).collect(Collectors.toList());
+ mdcMessageApproval.setApproverIds(String.join(",", superIdList));
+ List<String> superNameList = superList.stream().map(SysUser::getRealname).collect(Collectors.toList());
+ mdcMessageApproval.setApproverNames(String.join(",", superNameList));
+ }
+ mdcMessageApproval.setMsgSource("鎵嬪姩涓婃姤");
+ mdcMessageApproval.setMsgStatus(MdcConstant.MSG_STATUS_0);
+ this.save(mdcMessageApproval);
+ return true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
}
- mdcMessageApproval.setMsgSource("鎵嬪姩涓婃姤");
- mdcMessageApproval.setMsgStatus(MdcConstant.MSG_STATUS_0);
- return result;
}
}
--
Gitblit v1.9.3