diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java
index c2f21e269..9f12c1de9 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java
@@ -56,7 +56,8 @@ public class ApiPointsController {
      * @date 2021/9/29 10:13
      */
     @GetMapping("getProductList")
-    public Result<List<ProductInfoResultDTO>> getProductList(ProductInfoFormDTO formDto) {
+    public Result<List<ProductInfoResultDTO>> getProductList(@LoginUser TokenDto userDetail, ProductInfoFormDTO formDto) {
+        formDto.setDeptId(userDetail.getGridId());
         return pointsService.getProductList(formDto);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/form/ProductInfoFormDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/form/ProductInfoFormDTO.java
index 4c9b55016..a8223eb36 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/form/ProductInfoFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/form/ProductInfoFormDTO.java
@@ -55,4 +55,6 @@ public class ProductInfoFormDTO implements Serializable {
      */
     private String searchKey;
 
+    private long deptId;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ProductDetailsResultDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ProductDetailsResultDTO.java
index 65f6306ab..2e5969c3d 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ProductDetailsResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ProductDetailsResultDTO.java
@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  *  @author: qushutong
@@ -36,24 +37,24 @@ public class ProductDetailsResultDTO implements Serializable {
     /**
      * 积分
      */
-    private String points;
+    private Integer points;
 
 
     /**
      * 数量
      */
-    private String amount;
+    private Integer amount;
 
     /**
      * 开始时间
      */
-    private String startTime;
+    private Date startTime;
 
 
     /**
      * 结束时间
      */
-    private String endTime;
+    private Date endTime;
 
 
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java
index 77a91a512..5f55c7e88 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java
@@ -40,6 +40,7 @@ import com.elink.esua.epdc.dto.result.PointExchangeResultDTO;
 import com.elink.esua.epdc.dto.result.ProductDetailsResultDTO;
 import com.elink.esua.epdc.dto.result.ProductInfoResultDTO;
 import com.elink.esua.epdc.entity.AcitveProductDeptEntity;
+import com.elink.esua.epdc.entity.AcitveProductExchangeEntity;
 import com.elink.esua.epdc.entity.AcitveProductInfoEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.OssFeignClient;
@@ -220,6 +221,7 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
     @Override
     public Result<ProductDetailsResultDTO> getProductDetail(String productId) {
         AcitveProductInfoEntity acitveProductInfoEntity = baseDao.selectById(productId);
+        System.out.println("11111111111111111111111getProductDetail"+acitveProductInfoEntity.toString());
         return new Result<ProductDetailsResultDTO>().ok(ConvertUtils.sourceToTarget(acitveProductInfoEntity, ProductDetailsResultDTO.class));
     }
 
@@ -267,8 +269,8 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
         acitveProductExchangeDTO.setProductName(acitveProductInfoEntity.getName());
         acitveProductExchangeDTO.setExchangeTime(new Date());
         acitveProductExchangeDTO.setExchangeState("0");
-
-        acitveProductExchangeService.save(acitveProductExchangeDTO);
+        AcitveProductExchangeEntity entity = ConvertUtils.sourceToTarget(acitveProductExchangeDTO, AcitveProductExchangeEntity.class);
+        acitveProductExchangeService.insert(entity);
         // 根据核销兑换接口链接 生成核销二维码。
         String qrcodeUrl =null;
         System.out.println("22222222222222222222");
@@ -285,8 +287,8 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
         }
         System.out.println("333333333333"+qrcodeUrl);
         // 更新二维码地址
-        acitveProductExchangeDTO.setQrCodeUrl(qrcodeUrl);
-        acitveProductExchangeService.update(acitveProductExchangeDTO);
+        entity.setQrCodeUrl(qrcodeUrl);
+        acitveProductExchangeService.updateById(entity);
 
         PointExchangeResultDTO pointExchangeResultDTO = new PointExchangeResultDTO();
         pointExchangeResultDTO.setSuccess(true);
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml
index 9ff506983..c87cd7577 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml
@@ -77,6 +77,8 @@
         info.POINTS points
         FROM
         epdc_acitve_product_info info
+        LEFT JOIN epdc_acitve_product_dept dept ON
+        info.id =dept.PRODUCT_ID
         WHERE
         (
         info.AMOUNT - (
@@ -93,6 +95,7 @@
         AND info.STATE = '1'
         AND info.`NAME` LIKE '%' #{searchKey} '%'
         AND info.DEL_FLAG = '0'
+        AND dept.DEPT_ID=#{deptId}
         ORDER BY
         info.CREATED_TIME DESC
          LIMIT #{pageIndex},#{pageSize}