From aedc0b639e33c6a0850358dec6fcf8786bb598be Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 23 Dec 2021 10:54:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=94=B5=E8=AF=9D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=81=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserMessageDao.xml | 2 +- .../java/com/epmet/controller/CustomerStaffController.java | 4 ++-- .../src/main/java/com/epmet/service/CustomerStaffService.java | 2 +- .../java/com/epmet/service/impl/CustomerStaffServiceImpl.java | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml index a8e323ccfa..2b80a6cc56 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml @@ -84,7 +84,7 @@ UPDATE user_message - SET del_flag = '0', + SET del_flag = '1', updated_by = #{userId}, updated_time = NOW() WHERE diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index cc3911cca3..60e935497e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -484,9 +484,9 @@ public class CustomerStaffController { * @Description 【事件】网格员服务电话 **/ @PostMapping(value = "gridmobilelist") - public Result> gridMobileList(@RequestBody GridMobileListFormDTO formDTO) { + public Result> gridMobileList(@LoginUser TokenDto tokenDto, @RequestBody GridMobileListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, GridMobileListFormDTO.Gridobile.class); - return new Result>().ok(customerStaffService.gridMobileList(formDTO.getGridId())); + return new Result>().ok(customerStaffService.gridMobileList(formDTO.getGridId(), tokenDto.getUserId())); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java index d7bc875993..e986aa8f07 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java @@ -346,5 +346,5 @@ public interface CustomerStaffService extends BaseService { * @Author sun * @Description 【事件】网格员服务电话 **/ - List gridMobileList(String gridId); + List gridMobileList(String gridId, String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index cb360e3d08..418b9dfbc6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -804,11 +804,12 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl gridMobileList(String gridId) { + public List gridMobileList(String gridId, String userId) { List resultList = new ArrayList<>(); //1.查询网格下工作人员列表 CommonGridIdFormDTO dto = new CommonGridIdFormDTO(); dto.setGridId(gridId); + dto.setUserId(userId); Result> gridStaffs = govOrgOpenFeignClient.getGridStaffs(dto); if (!gridStaffs.success()) { throw new RenException("获取网格下工作人员列表失败!");