From 12035263dc0ec2c9bf2694f52a0120000d3e450a Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 23 May 2022 10:02:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=90=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=B9=B3=E9=9D=A2=E5=9B=BE=E3=80=91=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8/=E5=9C=B0=E5=9B=BE=20=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/VolunteerPolyListFormDTO.java    |  8 +++++++
 .../dto/form/VolunteerPolyMapDataFormDTO.java | 10 ++++++++-
 .../controller/IcVolunteerPolyController.java |  1 -
 .../com/epmet/dao/IcVolunteerPolyDao.java     |  6 ++++--
 .../impl/IcVolunteerPolyServiceImpl.java      |  4 ++--
 .../resources/mapper/IcVolunteerPolyDao.xml   | 21 +++++++++++++++----
 6 files changed, 40 insertions(+), 10 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 d721f7f12c..ca2126c3d7 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
@@ -19,5 +19,13 @@ public class VolunteerPolyListFormDTO extends PageFormDTO implements Serializabl
      */
     private String code;
 
+    /**
+     * 用户id
+     */
     private String customerId;
+
+    /**
+     * 组织id
+     */
+    private String agencyId;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyMapDataFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyMapDataFormDTO.java
index f6c841e5c7..57812e784b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyMapDataFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyMapDataFormDTO.java
@@ -17,7 +17,15 @@ public class VolunteerPolyMapDataFormDTO implements Serializable {
     /**
      * 志愿者分类code
      */
-    @NotBlank(message = "分类不能为空")
     private String code;
+
+    /**
+     * 客户id
+     */
     private String customerId;
+
+    /**
+     * 组织id
+     */
+    private String agencyId;
 }
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 66187d1cda..70fc542106 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
@@ -87,7 +87,6 @@ public class IcVolunteerPolyController {
     @PostMapping("/mapData")
     public Result<List<VolunteerPolyMapDataResultDTO>> getMapData(@RequestBody VolunteerPolyMapDataFormDTO form, @LoginUser TokenDto tokenDto) {
         form.setCustomerId(tokenDto.getCustomerId());
-        ValidatorUtils.validateEntity(form);
         List<VolunteerPolyMapDataResultDTO> dto = icVolunteerPolyService.getMapData(form);
         return new Result<List<VolunteerPolyMapDataResultDTO>>().ok(dto);
     }
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 a0f779c0a0..c4d63dc49e 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
@@ -25,14 +25,16 @@ public interface IcVolunteerPolyDao extends BaseDao<IcVolunteerPolyEntity> {
      * @param code
      */
     List<VolunteerPolyMapDataResultDTO> getMapData(@Param("code") String code,
-                                                   @Param("customerId") String customerId);
+                                                   @Param("customerId") String customerId,
+                                                   @Param("agencyId") String agencyId);
 
     /**
      * 【网格党建平面图】列表
      * @param code
      */
     List<VolunteerPolyListResultDTO> getList(@Param("code") String code,
-                                             @Param("customerId") String customerId);
+                                             @Param("customerId") String customerId,
+                                             @Param("agencyId") String agencyId);
 
     void deleteDataByCustomerId(@Param("customerId") String customerId);
     void deleteCategoryByCustomerId(@Param("customerId") String customerId);
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 26feebf48f..373f7613fc 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
@@ -141,7 +141,7 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
      */
     @Override
     public List<VolunteerPolyMapDataResultDTO> getMapData(VolunteerPolyMapDataFormDTO form) {
-        List<VolunteerPolyMapDataResultDTO> dto = baseDao.getMapData(form.getCode(), form.getCustomerId());
+        List<VolunteerPolyMapDataResultDTO> dto = baseDao.getMapData(form.getCode(), form.getCustomerId(),form.getAgencyId());
         // 获取gridName
         for (VolunteerPolyMapDataResultDTO item : dto) {
             if (StringUtils.isNotEmpty(item.getGridId())) {
@@ -172,7 +172,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(), form.getCustomerId());
+        List<VolunteerPolyListResultDTO> result = baseDao.getList(form.getCode(), form.getCustomerId(),form.getAgencyId());
         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 74495dd3d7..39827cd126 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
@@ -44,6 +44,9 @@
             <if test="code != null and code != ''">
                 AND c.VOLUNTEER_CATEGORY = #{code}
             </if>
+            <if test="agencyId != null and agencyId != ''">
+                AND p.AGENCY_ID = #{agencyId}
+            </if>
         </where>
     </select>
     <select id="getList" resultType="com.epmet.dto.result.VolunteerPolyListResultDTO">
@@ -56,10 +59,20 @@
             p.ID_CARD
         FROM
             ic_volunteer_poly p
-            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}
+            LEFT JOIN ic_volunteer_poly_category c ON p.ID_CARD = c.ID_CARD
+            AND c.del_flag = '0'
+        <where>
+            p.del_flag = '0'
+            <if test="code != null and code != ''">
+                AND c.VOLUNTEER_CATEGORY = #{code}
+            </if>
+            <if test="customerId != null and customerId != ''">
+                AND c.CUSTOMER_ID = #{customerId}
+            </if>
+            <if test="agencyId != null and agencyId != ''">
+                AND p.AGENCY_ID = #{agencyId}
+            </if>
+        </where>
     </select>
     <select id="getStatistics" resultType="com.epmet.dto.result.VolunteerPolyPieResultDTO">
         SELECT