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

liyong

2 天以前 a92b12d5adaa8827c1474d42b73c98e17953ecb5

 src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java

@@ -131,7 +131,7 @@

    @Override
    public List<ProductStructureDto> listBybomId(Integer bomId) {
        List<ProductStructureDto> list = productStructureMapper.listBybomId(bomId);
        List<ProductStructureDto> list = productStructureMapper.listBybomId(bomId, false);

        Map<Long, ProductStructureDto> map = new HashMap<>();
        for (ProductStructureDto node : list) {
@@ -154,4 +154,9 @@
        return tree;
    }

    @Override
    public List<ProductStructureDto> listBybomIdIsParent(Integer bomId) {
        return productStructureMapper.listBybomId(bomId, true);
    }

}