From e56c1cce484cd8df8c3373d4e2b5847d11b09abe Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 23 九月 2025 14:08:10 +0800
Subject: [PATCH] 代码合并解决冲突 bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalFlowNodeServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalFlowNodeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalFlowNodeServiceImpl.java
index b6f4181..967db7c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalFlowNodeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalFlowNodeServiceImpl.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.system.mapper.OaApprovalFlowNodeMapper;
import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.TDeptMapper;
import com.ruoyi.system.model.OaApprovalFlowNode;
import com.ruoyi.system.query.ApprovalNodeListQuery;
import com.ruoyi.system.service.OaApprovalFlowNodeService;
@@ -29,19 +31,34 @@
@Autowired
private SysUserMapper sysUserMapper;
+ @Autowired
+ private TDeptMapper deptMapper;
@Override
public List<OaApprovalFlowNode> pageList(ApprovalNodeListQuery query) {
List<SysUser> sysUsers = sysUserMapper.selectList();
- Map<Long, String> deptMaps = sysUsers.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
+ Map<Long, String> userMaps = sysUsers.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
+ Map<Integer, String> deptMaps = deptMapper.selectList(null).stream().collect(Collectors.toMap(TDept::getId, TDept::getDeptName));
List<OaApprovalFlowNode> oaApprovalFlowNodes = this.baseMapper.selectList(new LambdaQueryWrapper<OaApprovalFlowNode>()
.eq(OaApprovalFlowNode::getApprovalId, query.getId()));
for (OaApprovalFlowNode approvalVO : oaApprovalFlowNodes) {
StringBuilder approvalName = new StringBuilder();
if (approvalVO.getApprovalType() != 0){
- for (String approvalId : approvalVO.getApprovalIds().split(",")) {
- String orDefault = deptMaps.getOrDefault(Long.valueOf(approvalId), "");
- approvalName.append(orDefault).append(",");
+ if (approvalVO.getApprovalType() == 2){
+ for (String approvalId : approvalVO.getApprovalIds().split(",")) {
+ String orDefault = userMaps.getOrDefault(Long.valueOf(approvalId), "");
+ if (StringUtils.hasLength(orDefault)){
+ approvalName.append(orDefault).append(",");
+ }
+ }
+ }else{
+ for (String approvalId : approvalVO.getApprovalIds().split(",")) {
+ String orDefault = deptMaps.getOrDefault(Integer.valueOf(approvalId), "");
+ if (StringUtils.hasLength(orDefault)){
+ approvalName.append(orDefault).append(",");
+ }
+ }
}
+
if (StringUtils.hasLength(approvalName)){
approvalVO.setApprovalName(approvalName.substring(0,approvalName.length()-1));
}else{
--
Gitblit v1.7.1