化验页面优化1

czt

2023-06-01 419e76f6256868851ed245940297f7f5bfd99e55

 igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java

@@ -30,23 +30,18 @@
     *
     * @param checkId
     * @param companyId
     * @param deptId
     * @param foodVariety
     * @return
     */
    public List<CheckItemData> listCheckItem(String checkId, String companyId,
                                             String deptId, String foodVariety) {
    public List<CheckItemData> listCheckItem(String checkId, String companyId, String foodVariety) {
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        if (StringUtils.isEmpty(deptId)) {
            deptId = ContextUtil.subDeptId(ContextUtil.getLoginUser());
        }

        List<CheckItemData> list = checkStandardService.getCheckItemById(checkId, companyId);

        if (list == null || list.isEmpty()) {
            list = checkStandardService.getCheckItemByStandard(checkId, companyId, deptId, foodVariety);
            list = checkStandardService.getCheckItemByStandard(checkId, companyId, foodVariety);
        }
        return list;
    }