代码合并解决冲突 bug修改

无关风月

1 天以前 e56c1cce484cd8df8c3373d4e2b5847d11b09abe

代码合并解决冲突 bug修改

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java

@@ -526,19 +526,6 @@
        res.setRecords(resList);
        return R.ok(res);
    }
            OaApprovalFlowAudit approvalFlowAudit = approvalFlowAuditMap.get(approvalFlowNode.getId());
            if (approvalFlowAudit!=null){
                approvalFlowNodeVO.setFlowName(approvalFlowAudit.getFlowName());
                approvalFlowNodeVO.setUserName(approvalFlowAudit.getUserName());
                approvalFlowNodeVO.setSignPicUrl(approvalFlowAudit.getSignPicUrl());
                approvalFlowNodeVO.setApprovalStatus(approvalFlowAudit.getApprovalStatus());
            }else{
                approvalFlowNodeVO.setFlowName(approvalFlowNode.getFlowName());
            }
            approvalFlowNodeListVOS.add(approvalFlowNodeVO);
        }
        return approvalFlowNodeListVOS;
    }



@@ -631,9 +618,8 @@
                    }
                }
            }


        }
        return R.ok();
    }
}

    }
}

 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){
                if (approvalVO.getApprovalType() == 2){
                for (String approvalId : approvalVO.getApprovalIds().split(",")) {
                    String orDefault = deptMaps.getOrDefault(Long.valueOf(approvalId), "");
                        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{