mitao
2024-04-19 604d00f67ddcf25a9d079ceddd1c668b2a4e5288
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java
@@ -187,6 +187,7 @@
                .eq(TbField::getStatus, ShowStatusEnum.SHOW)
                .eq(StringUtils.isNotNull(query.getFieldType()), TbField::getFieldType,
                        query.getFieldType())
                .eq(TbField::getFieldType, FieldTypeEnum.NUMBER)
                .orderByDesc(TbField::getCreateTime)
                .page(new Page<>(query.getPageNum(), query.getPageSize()));
        if (CollUtils.isEmpty(page.getRecords())) {
@@ -205,9 +206,16 @@
    }
    @Override
    public List<FieldVO> listFields() {
    public List<FieldVO> listFields(String type) {
        FieldTypeEnum fieldTypeEnum;
        try {
            fieldTypeEnum = FieldTypeEnum.getEnumByDesc(type);
        } catch (IllegalArgumentException e) {
            throw new ServiceException("非法参数");
        }
        List<TbField> list = this.list(
                Wrappers.<TbField>lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW));
                Wrappers.<TbField>lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW)
                        .eq(Objects.nonNull(fieldTypeEnum), TbField::getFieldType, fieldTypeEnum));
        return BeanUtils.copyList(list, FieldVO.class);
    }