Merge remote-tracking branch 'origin/master'

hdy

2024-01-19 2d5bfe0ce8d904025844ee55082ebc08fbfee975

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java

@@ -35,6 +35,8 @@
    @Autowired
    private ProductProcessService productProcessService;

    private static final String ZERO = "0";

    /**
     * 查询配方配置子信息列表
     */
@@ -49,7 +51,8 @@
            formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
            formulaChildInfo.setImg(formulaChildInfo.getPicture());
        }
        list = list.stream().sorted(Comparator.comparing(BsFormulaChildInfo::getSort)).collect(Collectors.toList());
        list = list.stream()
                .filter(x -> !ZERO.equals(x.getSort())).sorted(Comparator.comparing(BsFormulaChildInfo::getSort)).collect(Collectors.toList());
        return getDataTable(list);
    }