From 2bdbc6648cb4e340d057063324f46c2fce013544 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 23 十二月 2024 10:36:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsShopServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsShopServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsShopServiceImpl.java
index 233b2b1..c03f9e3 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsShopServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsShopServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.mapper.GoodsShopMapper;
import com.ruoyi.other.api.domain.GoodsShop;
@@ -39,10 +40,11 @@
* @return
*/
@Override
- public List<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo) {
+ public PageInfo<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo) {
+ PageInfo<ShopGoodsList> pageInfo = new PageInfo(shopGoodsListVo.getPageCurr(), shopGoodsListVo.getPageSize());
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
- List<ShopGoodsList> shopGoodsList = this.baseMapper.getShopGoodsList(sysUser.getObjectId(), shopGoodsListVo.getId(), shopGoodsListVo.getName(), shopGoodsListVo.getGoodsCategoryId());
- return shopGoodsList;
+ List<ShopGoodsList> shopGoodsList = this.baseMapper.getShopGoodsList(pageInfo, sysUser.getObjectId(), shopGoodsListVo.getId(), shopGoodsListVo.getName(), shopGoodsListVo.getGoodsCategoryId());
+ return pageInfo.setRecords(shopGoodsList);
}
}
--
Gitblit v1.7.1