Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

buhuazhen

5 天以前 392366ea36a839e5d0ea05968e6da31cd53a9ee6

 basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalPlanServiceImpl.java

@@ -78,6 +78,16 @@
    }

    @Override
    public boolean checkPlanExists(String fieldIds) {
        if (StringUtils.isBlank(fieldIds)) {
            return false;
        }

        // 查询数据库
        return coalPlanMapper.existsFieldIds(fieldIds) > 0;
    }

    @Override
    public List<CoalFieldVo> selectCoalPlanById(Long id) {
        CoalPlan coalPlan = coalPlanMapper.selectById(id);
        LambdaQueryWrapper<CoalField> coalFieldLambdaQueryWrapper = new LambdaQueryWrapper<>();