From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 13:42:41 +0800
Subject: [PATCH] 去除多余引用
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 8c3565a..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
@@ -3,14 +3,20 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.constant.MdcConstant;
import org.jeecg.modules.mdc.entity.MdcMessageApproval;
import org.jeecg.modules.mdc.mapper.MdcMessageApprovalMapper;
import org.jeecg.modules.mdc.service.IMdcMessageApprovalService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @Description: mdc娑堟伅纭琛�
@@ -20,6 +26,9 @@
*/
@Service
public class MdcMessageApprovalServiceImpl extends ServiceImpl<MdcMessageApprovalMapper, MdcMessageApproval> implements IMdcMessageApprovalService {
+
+ @Resource
+ private ISysUserService sysUserService;
/**
* 鍒〃鏌ヨ
@@ -33,11 +42,35 @@
if (item.getSenderIds().contains(userId) && (item.getMsgStatus().equals(MdcConstant.MSG_STATUS_0) || item.getMsgStatus().equals(MdcConstant.MSG_STATUS_3))) {
item.setHasProcess(true);
}
- if (item.getSenderIds().contains(userId) && item.getMsgStatus().equals(MdcConstant.MSG_STATUS_1)) {
+ if (item.getApproverIds().contains(userId) && item.getMsgStatus().equals(MdcConstant.MSG_STATUS_1)) {
item.setHasConfirm(true);
}
});
}
return pageList;
}
+
+ @Override
+ public boolean add(MdcMessageApproval mdcMessageApproval) {
+ 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;
+ }
+ }
}
--
Gitblit v1.9.3