diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGridMemberController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGridMemberController.java index 83b09a3..da6c67e 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGridMemberController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGridMemberController.java @@ -41,8 +41,8 @@ public class ApiGridMemberController { * @return com.elink.esua.epdc.commons.tools.utils.Result */ @GetMapping("getMemberList") - public Result getMemberList(@LoginUser TokenDto userDetail,AppMemberListFromDTO dto){ - return adminService.getMemberList(userDetail,dto); + public Result getMemberList(AppMemberListFromDTO dto){ + return adminService.getMemberList(dto); } /** diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java index b244bde..2831eb5 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java @@ -93,7 +93,7 @@ public interface AdminService { * @params [AppMemberListFromDTO] * @return com.elink.esua.epdc.commons.tools.utils.Result */ - Result getMemberList(TokenDto userDetail,AppMemberListFromDTO dto); + Result getMemberList(AppMemberListFromDTO dto); /** * @describe: 行程上报获取省/市/区/街道/社区信息,通过pid diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index d831f49..126f535 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -150,8 +150,8 @@ public class AdminServiceImpl implements AdminService { } @Override - public Result getMemberList(TokenDto userDetail, AppMemberListFromDTO dto) { -// dto.setDeptId(userDetail.getGridId()); + public Result getMemberList( AppMemberListFromDTO dto) { + log.info("getMemberList--dto:"+dto); return adminFeignClient.getMemberList(dto); }