Merge branch 'feature_asset'

mitao

昨天 6534aeb7d0f8bf1541140645d161ffade21b3fbc

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalFlowNodeServiceImpl.java

@@ -1,10 +1,23 @@
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.basic.PageInfo;
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.model.OaApprovalFlowNode;
import com.ruoyi.system.query.ApprovalListQuery;
import com.ruoyi.system.service.OaApprovalFlowNodeService;
import com.ruoyi.system.vo.system.ApprovalFlowNodeVO;
import com.ruoyi.system.vo.system.ApprovalVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * <p>
@@ -17,4 +30,22 @@
@Service
public class OaApprovalFlowNodeServiceImpl extends ServiceImpl<OaApprovalFlowNodeMapper, OaApprovalFlowNode> implements OaApprovalFlowNodeService {

    @Autowired
    private SysUserMapper sysUserMapper;
    @Override
    public List<OaApprovalFlowNode> pageList(ApprovalListQuery 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();
            for (String approvalId : approvalVO.getApprovalIds().split(",")) {
                String orDefault = deptMaps.getOrDefault(Long.valueOf(approvalId), "");
                approvalName.append(orDefault).append(",");
            }
            approvalVO.setApprovalName(approvalName.substring(0,approvalName.length()-1));
        }
        return oaApprovalFlowNodes;
    }
}