【网格党建平面图】列表补充查询字段

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;
 }

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);
     }

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);
 }

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());
     }

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>