From 0ed495f229fc980df75712c2cff7cdda3b35f608 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 19 May 2022 14:53:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=85=9A=E5=BB=BA?=
 =?UTF-8?q?=E5=B9=B3=E9=9D=A2=E5=9B=BE=E3=80=91=E5=88=97=E8=A1=A8=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/VolunteerPolyListFormDTO.java | 2 ++
 .../java/com/epmet/controller/IcVolunteerPolyController.java   | 3 ++-
 .../src/main/java/com/epmet/dao/IcVolunteerPolyDao.java        | 3 ++-
 .../com/epmet/service/impl/IcVolunteerPolyServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/IcVolunteerPolyDao.xml           | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyListFormDTO.java
index 450d9d5c71..d721f7f12c 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyListFormDTO.java
@@ -18,4 +18,6 @@ public class VolunteerPolyListFormDTO extends PageFormDTO implements Serializabl
      * 志愿者代码
      */
     private String code;
+
+    private String customerId;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVolunteerPolyController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVolunteerPolyController.java
index fec796983e..af09d7312f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVolunteerPolyController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVolunteerPolyController.java
@@ -98,7 +98,8 @@ public class IcVolunteerPolyController {
      * @date 2022/5/19 14:49
      */
     @PostMapping("list")
-    public Result<PageData> getList(@RequestBody VolunteerPolyListFormDTO form){
+    public Result<PageData> getList(@RequestBody VolunteerPolyListFormDTO form,@LoginUser TokenDto tokenDto){
+        form.setCustomerId(tokenDto.getCustomerId());
         PageData data = icVolunteerPolyService.getList(form);
         return new Result<PageData>().ok(data);
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVolunteerPolyDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVolunteerPolyDao.java
index 1966e82f63..79ca4b5d4d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVolunteerPolyDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVolunteerPolyDao.java
@@ -29,5 +29,6 @@ public interface IcVolunteerPolyDao extends BaseDao<IcVolunteerPolyEntity> {
      * 【网格党建平面图】列表
      * @param code
      */
-    List<VolunteerPolyListResultDTO> getList(@Param("code") String code);
+    List<VolunteerPolyListResultDTO> getList(@Param("code") String code,
+                                             @Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java
index 37c99bb888..9d5fcb1113 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java
@@ -133,7 +133,7 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
     @Override
     public PageData getList(VolunteerPolyListFormDTO form) {
         PageHelper.startPage(form.getPageNo(),form.getPageSize());
-        List<VolunteerPolyListResultDTO> result = baseDao.getList(form.getCode());
+        List<VolunteerPolyListResultDTO> result = baseDao.getList(form.getCode(),form.getCustomerId());
         PageInfo<VolunteerPolyListResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml
index d2e16c8315..617416426e 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml
@@ -52,6 +52,7 @@
             LEFT JOIN ic_volunteer_poly_category c ON p.ID_CARD = c.ID_CARD AND c.del_flag = '0'
         WHERE
             c.VOLUNTEER_CATEGORY = #{code}
+            AND c.CUSTOMER_ID = #{customerId}
     </select>