bug修改

mitao

2025-04-02 2f3d3fb97bd4ebdc00c40a2774465c8b3487b6d1

 medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java

@@ -133,6 +133,7 @@
        Page<SysDictData> result = this.lambdaQuery()
                .like(StringUtils.isNotBlank(query.getKeyword()), SysDictData::getDictLabel, query.getKeyword())
                .eq(StringUtils.isNotBlank(query.getDictType()), SysDictData::getDictType, query.getDictType())
                .orderByAsc(SysDictData::getDictSort)
                .orderByDesc(SysDictData::getDictCode)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        List<String> dictTypeList = result.getRecords().stream().map(SysDictData::getDictType).distinct().collect(Collectors.toList());
@@ -167,12 +168,20 @@

    @Override
    public List<SysDictDataVO> medicalWasteTypeList() {
        return getSysDictDataVOListByType("medical_waste_type");
        return getSysDictDataVOListByType("medical_waste_type", null);
    }

    @Override
    public List<SysDictDataVO> medicalWasteTypeListByDictCode(List<Long> wasteTypeCodeList) {
        return getSysDictDataVOListByType("medical_waste_type", wasteTypeCodeList);
    }

    @Nullable
    private List<SysDictDataVO> getSysDictDataVOListByType(String dictType) {
        List<SysDictData> medicalWasteTypeList = lambdaQuery().eq(SysDictData::getDictType, dictType).orderByDesc(SysDictData::getDictCode).list();
    private List<SysDictDataVO> getSysDictDataVOListByType(String dictType, List<Long> dictCodeList) {
        List<SysDictData> medicalWasteTypeList = lambdaQuery().eq(SysDictData::getDictType, dictType)
                .in(CollUtils.isNotEmpty(dictCodeList), SysDictData::getDictCode, dictCodeList)
                .orderByAsc(SysDictData::getDictSort)
                .orderByDesc(SysDictData::getDictCode).list();
        return BeanUtils.copyToList(medicalWasteTypeList, SysDictDataVO.class);
    }

@@ -183,7 +192,7 @@
     */
    @Override
    public List<SysDictDataVO> equipmentTypeList() {
        return getSysDictDataVOListByType("protection_equipment_type");
        return getSysDictDataVOListByType("protection_equipment_type", null);
    }

    /**
@@ -193,7 +202,7 @@
     */
    @Override
    public List<SysDictDataVO> regulationsTypeList() {
        return getSysDictDataVOListByType("protection_regulation_type");
        return getSysDictDataVOListByType("protection_regulation_type", null);
    }

    /**
@@ -203,16 +212,16 @@
     */
    @Override
    public List<SysDictDataVO> workTypeList() {
        return getSysDictDataVOListByType("protective_work_type");
        return getSysDictDataVOListByType("protective_work_type", null);
    }

    @Override
    public List<SysDictDataVO> institutionLevelList() {
        return getSysDictDataVOListByType("institution_level");
        return getSysDictDataVOListByType("institution_level", null);
    }

    @Override
    public List<SysDictDataVO> institutionTypeList() {
        return getSysDictDataVOListByType("institution_type");
        return getSysDictDataVOListByType("institution_type", null);
    }
}