From 17ecaecf46d5497aec0fcb9d9fcacb8591003285 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 21 五月 2024 19:33:38 +0800
Subject: [PATCH] Merge branch 'dev-mitao'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsInfoTitleServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsInfoTitleServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsInfoTitleServiceImpl.java
index b2a43dc..0c45044 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsInfoTitleServiceImpl.java
+++ b/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);
}
--
Gitblit v1.7.1