From dff734d736636b8a246afd18183d15792e4c79df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sat, 28 Aug 2021 22:10:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A7=9F=E6=88=B7=E4=BC=9A?= =?UTF-8?q?=E8=A2=AB=E8=AF=AF=E5=88=A0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsh/erp/constants/ExceptionConstants.java | 3 +++ .../src/main/java/com/jsh/erp/service/user/UserService.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java index 8414a989..867eb49a 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java @@ -76,6 +76,9 @@ public class ExceptionConstants { //演示用户不允许修改 public static final int USER_LIMIT_UPDATE_CODE = 500007; public static final String USER_LIMIT_UPDATE_MSG = "抱歉，演示模式下的演示用户不允许修改"; + //租户不能被删除 + public static final int USER_LIMIT_TENANT_DELETE_CODE = 500008; + public static final String USER_LIMIT_TENANT_DELETE_MSG = "抱歉，租户不能被删除"; /** * 角色信息 diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java index 75da1018..1ad8ad3d 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java @@ -263,6 +263,12 @@ public class UserService { throw new BusinessRunTimeException(ExceptionConstants.USER_LIMIT_DELETE_CODE, ExceptionConstants.USER_LIMIT_DELETE_MSG); } + if(user.getId().equals(user.getTenantId())) { + logger.error("异常码[{}],异常提示[{}],参数,ids:[{}]", + ExceptionConstants.USER_LIMIT_TENANT_DELETE_CODE,ExceptionConstants.USER_LIMIT_TENANT_DELETE_MSG,ids); + throw new BusinessRunTimeException(ExceptionConstants.USER_LIMIT_TENANT_DELETE_CODE, + ExceptionConstants.USER_LIMIT_TENANT_DELETE_MSG); + } sb.append("[").append(user.getLoginName()).append("]"); } logService.insertLog("用户", sb.toString(),