From 10f6e465c9753ff99099a22aabe72ede4e25eab7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 23 九月 2025 13:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalFlowNodeServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 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 41022f7..b6f4181 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
@@ -1,10 +1,20 @@
package com.ruoyi.system.service.impl;
+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.system.mapper.OaApprovalFlowNodeMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.OaApprovalFlowNode;
+import com.ruoyi.system.query.ApprovalNodeListQuery;
import com.ruoyi.system.service.OaApprovalFlowNodeService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,4 +27,31 @@
@Service
public class OaApprovalFlowNodeServiceImpl extends ServiceImpl<OaApprovalFlowNodeMapper, OaApprovalFlowNode> implements OaApprovalFlowNodeService {
+ @Autowired
+ private SysUserMapper sysUserMapper;
+ @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));
+ 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 (StringUtils.hasLength(approvalName)){
+ approvalVO.setApprovalName(approvalName.substring(0,approvalName.length()-1));
+ }else{
+ approvalVO.setApprovalName("");
+ }
+ }else{
+ approvalVO.setApprovalName("上级部门");
+ }
+
+ }
+ return oaApprovalFlowNodes;
+ }
}
--
Gitblit v1.7.1