From 3b8e986e2efbc5c55b27d0125c3d1e18eca02f71 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 28 Apr 2020 10:23:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 3 ++- .../src/main/java/com/epmet/controller/StaffController.java | 4 ++-- .../src/main/java/com/epmet/service/StaffService.java | 2 +- .../main/java/com/epmet/service/impl/StaffServiceImpl.java | 5 ++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 948e607ed1..38e7eeeae5 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -38,7 +38,8 @@ public enum EpmetErrorCode { NOT_ADD_GRID(8401,"您当前的网格名称已存在，请重新修改"), MOBILE_USED(8402,"该手机号已注册"), STAFF_ADD_FAILED(8403,"人员添加失败"), - STAFF_EDIT_FAILED(8404,"人员编辑失败"); + STAFF_EDIT_FAILED(8404,"人员编辑失败"), + CANNOT_DISABLE_YOURSELF(8405,"您不能禁用自己"),; private int code; private String msg; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 9f9109a7ba..79da9b903b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -113,7 +113,7 @@ public class StaffController { * @return Result */ @PostMapping("disabledstaff") - public Result disabledStaff(@RequestBody StaffInfoFromDTO fromDTO){ - return staffService.disabledStaff(fromDTO); + public Result disabledStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffInfoFromDTO fromDTO){ + return staffService.disabledStaff(tokenDto, fromDTO); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java index fc4a17f93d..5f36f85c12 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java @@ -80,6 +80,6 @@ public interface StaffService { * @param fromDTO 参数 * @return Result */ - Result disabledStaff(StaffInfoFromDTO fromDTO); + Result disabledStaff(TokenDto tokenDto, StaffInfoFromDTO fromDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index d9d57bd34a..6db7038395 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -151,7 +151,10 @@ public class StaffServiceImpl implements StaffService { } @Override - public Result disabledStaff(StaffInfoFromDTO fromDTO) { + public Result disabledStaff(TokenDto tokenDto, StaffInfoFromDTO fromDTO) { + if (tokenDto.getUserId().equals(fromDTO.getStaffId())) { + return new Result().error(EpmetErrorCode.CANNOT_DISABLE_YOURSELF.getCode(), EpmetErrorCode.CANNOT_DISABLE_YOURSELF.getMsg()); + } return epmetUserFeignClient.disabledStaff(fromDTO); } }