From 1830bb64ea187ac92f2ecacfdabcf27be62178b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=BF=9E=E7=90=9B?= <1059178422@qq.com>
Date: Tue, 5 Jul 2022 11:17:35 +0800
Subject: [PATCH] test

---
 .../main/java/com/cnbm/basic/mapper/ProductTypeMapper.java  | 3 +--
 .../com/cnbm/basic/service/impl/ProductTypeServiceImpl.java | 6 +++---
 ym-baisc/src/main/resources/ProductTypeMapper.xml           | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java b/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java
index 66832f2..0325dd0 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java
@@ -1,7 +1,6 @@
 package com.cnbm.basic.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cnbm.basic.dto.ProductTypeDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.ProductType;
@@ -18,5 +17,5 @@ import java.util.Map;
  */
 @Mapper
 public interface ProductTypeMapper extends BaseDao<ProductType> {
-    IPage<ProductTypeDTO> page(Page<Object> objectPage, @Param("param") Map<String, Object> params);
+    IPage<ProductTypeDTO> page(IPage<ProductType> objectPage, @Param("param") Map<String, Object> params);
 }
\ No newline at end of file
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java
index ee04f68..ce4f13c 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java
@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.ProductTypeDTO;
@@ -40,11 +41,10 @@ public class ProductTypeServiceImpl extends CrudServiceImpl<ProductTypeMapper, P
 
     @Override
     public PageData<ProductTypeDTO> page (Map<String, Object> params){
-        PageData<ProductTypeDTO> data = null;
         QueryWrapper<ProductTypeDTO> wrapper = new QueryWrapper<>();
         wrapper.eq("id",params.get("id"));
-        IPage<ProductTypeDTO> page = productTypeMapper.page(new Page<>((Long) params.get("current"),(Long)params.get("size")), params);
-        return data;
+        IPage<ProductTypeDTO> page = productTypeMapper.page(getPage(params, Constant.CREATE_DATE, false), params);
+        return getPageData(page,ProductTypeDTO.class);
     }
 
 }
\ No newline at end of file
diff --git a/ym-baisc/src/main/resources/ProductTypeMapper.xml b/ym-baisc/src/main/resources/ProductTypeMapper.xml
index 515981f..1d0b51b 100644
--- a/ym-baisc/src/main/resources/ProductTypeMapper.xml
+++ b/ym-baisc/src/main/resources/ProductTypeMapper.xml
@@ -6,7 +6,7 @@
         select *
         from product_type
         <where>
-            id = #{params.get("id")}
+            id = #{id)}
         </where>
     </select>
 </mapper>