Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

buhuazhen

2 天以前 5de00e436cb41dee07b75c20391db7bc0a5b3660

 src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java

@@ -93,16 +93,17 @@
        });
    }

    private List<PlanNode> getPlanNodeByPlanId(Long planId) {
    @Override
    public List<PlanNode> getPlanNodeByPlanId(Long planId) {
        return planNodeMapper.selectList(new LambdaQueryWrapper<PlanNode>()
                .eq(PlanNode::getIsDelete, 0)
                .eq(PlanNode::getProjectManagementPlanId, planId));
                .eq(PlanNode::getProjectManagementPlanId, planId).orderByAsc(PlanNode::getSort));
    }

    private List<PlanNode> getPlanNodeByPlanIds(List<Long> planIds) {
        return planNodeMapper.selectList(new LambdaQueryWrapper<PlanNode>()
                .eq(PlanNode::getIsDelete, 0)
                .in(PlanNode::getProjectManagementPlanId, planIds));
                .in(PlanNode::getProjectManagementPlanId, planIds).orderByAsc(PlanNode::getSort));
    }