yys 修改审批协同bug

maven

10 小时以前 44dd382faaa45f46a9719d3b032629895ead8850

yys  修改审批协同bug

 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java

@@ -174,8 +174,43 @@
    @Override
    public void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) {
        ApproveProcess approve = approveProcessMapper.selectById(approveGetAndUpdateVo.getId());
        approve.setApproveUserIds(approveGetAndUpdateVo.getApproveUserIds());
        approve.setApproveReason(approveGetAndUpdateVo.getApproveReason());
        SysUser sysUser = sysUserMapper.selectUserById(approveGetAndUpdateVo.getApproveUser());
        String[] split = approveGetAndUpdateVo.getApproveUserIds().split(",");
        if(split.length == 0){
            throw new RuntimeException("请选择审批人");
        }
        List<SysUser> sysUsers = sysUserMapper.selectUserByIds(Arrays.asList(split).stream().map(Long::parseLong).collect(Collectors.toList()));
        if(CollectionUtils.isEmpty(sysUsers)) throw new RuntimeException("请选择审批人");
        if(sysUser == null) throw new RuntimeException("申请人不存在");
        approve.setApproveUserName(sysUser.getNickName());
        approve.setApproveUser(sysUser.getUserId());
        //审核中不可以编辑审核人
        if(approve.getApproveStatus() != 1){
            approve.setApproveUserCurrentId(sysUsers.get(0).getUserId());
            approve.setApproveUserCurrentName(sysUsers.get(0).getNickName());
        }
        updateById(approve);
        //修改审批人
        LambdaQueryWrapper<ApproveNode> approveNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
        approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approve.getApproveId())
                .eq(ApproveNode::getDeleteFlag, 0)
                .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
                .orderByAsc(ApproveNode::getApproveNodeOrder);
        List<ApproveNode> list = approveNodeMapper.selectList(approveNodeLambdaQueryWrapper);
        int i = 0;
        for (ApproveNode approveNode : list) {
            int finalI = i;
            List<SysUser> collect = sysUsers.stream().filter(user -> user.getUserId().equals(Long.parseLong(split[finalI]))).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(collect)){
                throw new RuntimeException("请选择正确的审批人");
            }
            approveNode.setApproveNodeUserId(collect.get(0).getUserId());
            approveNode.setApproveNodeUser(collect.get(0).getNickName());
            approveNodeMapper.updateById(approveNode);
            i++;
        }
    }



 src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java

@@ -12,4 +12,12 @@
    //申请事由
    @NotBlank(message = "申请事由不能为空")
    private String approveReason;

    private String approveUserIds;

    private Long approveUser;

    private String approveTime;

    private Integer approveStatus;
}