From 7981cf7259b5b4490a494fee431deb33d1feab7c Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 2 Mar 2019 14:56:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95][=E4=BF=AE=E6=94=B9]:=E5=8F=AA=E6=9C=89?= =?UTF-8?q?=E8=B6=85=E7=AE=A1=E6=89=8D=E5=8F=AF=E4=BB=A5=E5=90=AF=E5=81=9C?= =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MallUserInfoController.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java index 83a39bed8..c69f349be 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java @@ -221,14 +221,15 @@ public class MallUserInfoController extends BaseController { public ResultData modifyStatus(Long userId, Integer status) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::modifyStatus"); MallUserInfo currentUser = getUser(); - if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { - return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能删除用户"); + if (currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { + MallUserInfo userInfo = userInfoService.getById(userId); + userInfo.setStatus(status); + userInfo.setTenantId(getTenantId()); + userInfoService.saveOrUpdate(userInfo); + return new ResultData(); + } else { + return new ResultData(ErrorCode.USER_NO_PERMISSION); } - MallUserInfo userInfo = userInfoService.getById(userId); - userInfo.setStatus(status); - userInfo.setTenantId(getTenantId()); - userInfoService.saveOrUpdate(userInfo); - return new ResultData(userInfo); } private int checkUniqueName(String userName) {