Merge branch 'dev-mitao'

mitao

2024-05-21 17ecaecf46d5497aec0fcb9d9fcacb8591003285

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java

@@ -5,10 +5,10 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.goods.controller.mamagement.DTO.GoodsBrandDTO;
import com.ruoyi.goods.controller.mamagement.DTO.GoodsBrandQuery;
import com.ruoyi.goods.controller.mamagement.VO.GoodsBrandVO;
import com.ruoyi.goods.domain.pojo.GoodsBrand;
import com.ruoyi.goods.controller.management.DTO.GoodsBrandDTO;
import com.ruoyi.goods.controller.management.DTO.GoodsBrandQuery;
import com.ruoyi.goods.controller.management.VO.GoodsBrandVO;
import com.ruoyi.goods.domain.GoodsBrand;
import com.ruoyi.goods.mapper.GoodsBrandMapper;
import com.ruoyi.goods.service.IGoodsBrandService;
import java.util.List;
@@ -51,7 +51,9 @@
                .like(StringUtils.isNotEmpty(query.getBrandName()), GoodsBrand::getBrandName,
                        query.getBrandName())
                .page(new Page<GoodsBrand>(query.getPageCurr(), query.getPageSize()));

        if (StringUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page.getTotal(), page.getPages());
        }
        // 将查询结果转换为VO类的分页DTO
        return PageDTO.of(page, GoodsBrandVO.class);
    }