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 getList(@RequestBody VolunteerPolyListFormDTO form){ + public Result getList(@RequestBody VolunteerPolyListFormDTO form,@LoginUser TokenDto tokenDto){ + form.setCustomerId(tokenDto.getCustomerId()); PageData data = icVolunteerPolyService.getList(form); return new Result().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 { * 【网格党建平面图】列表 * @param code */ - List getList(@Param("code") String code); + List 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 result = baseDao.getList(form.getCode()); + List result = baseDao.getList(form.getCode(),form.getCustomerId()); PageInfo 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}