Merge branch 'dev-mitao'

mitao

2024-05-21 17ecaecf46d5497aec0fcb9d9fcacb8591003285

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsInfoTitleServiceImpl.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.GoodsInfoTitleDTO;
import com.ruoyi.goods.controller.mamagement.DTO.GoodsInfoTitleQuery;
import com.ruoyi.goods.controller.mamagement.VO.GoodsInfoTitleVO;
import com.ruoyi.goods.domain.pojo.GoodsInfoTitle;
import com.ruoyi.goods.controller.management.DTO.GoodsInfoTitleDTO;
import com.ruoyi.goods.controller.management.DTO.GoodsInfoTitleQuery;
import com.ruoyi.goods.controller.management.VO.GoodsInfoTitleVO;
import com.ruoyi.goods.domain.GoodsInfoTitle;
import com.ruoyi.goods.mapper.GoodsInfoTitleMapper;
import com.ruoyi.goods.service.IGoodsInfoTitleService;
import org.springframework.stereotype.Service;
@@ -37,6 +37,9 @@
                .like(StringUtils.isNotEmpty(query.getTitleName()), GoodsInfoTitle::getTitleName,
                        query.getTitleName())
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        if (StringUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page.getTotal(), page.getPages());
        }
        // 将查询结果转换为VO对象的分页DTO返回
        return PageDTO.of(page, GoodsInfoTitleVO.class);
    }