From b3f7434579733ff774e94120164e8da570cee9e0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 一月 2024 16:03:31 +0800
Subject: [PATCH] 修改部分界面

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
index 20802d2..6d05b9d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
@@ -6,19 +6,25 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 @DS("sd")
 public class ProductService {
     @Autowired
     ProductMapper productMapper;
-    public List<Product> defaultDateProduct(Integer pageNum,Integer pageSize,List<String> glassType,Product product) {
+    public Map<String,Object> defaultDateProduct(Integer pageNum, Integer pageSize, List<String> glassType, Product product) {
         Integer offset = (pageNum-1)*pageSize;
         String glassTypeId = null;
         if(glassType.size()>1){
             glassTypeId = glassType.get(1);
         }
-        return productMapper.defaultProduct(offset,pageSize,glassTypeId,product);
+        Map<String,Object> map = new HashMap<>();
+        map.put("list",productMapper.defaultProduct(offset,pageSize,glassTypeId,product));
+        map.put("pageNum",pageNum);
+
+        return map;
     }
 }

--
Gitblit v1.8.0