Merge remote-tracking branch 'origin/master'

hdy

2024-01-20 eec41baec6003ec443129bd1ae53ea2b2e5df4f3

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

@@ -15,7 +15,9 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

/**
 * 配方配置子信息Controller
@@ -33,6 +35,8 @@
    @Autowired
    private ProductProcessService productProcessService;

    private static final String ZERO = "0";

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