| @@ -221,14 +221,15 @@ public class MallUserInfoController extends BaseController { | |||||
| public ResultData modifyStatus(Long userId, Integer status) { | public ResultData modifyStatus(Long userId, Integer status) { | ||||
| logger.debug("[" + getIpAddr() + "] MallUserInfoController::modifyStatus"); | logger.debug("[" + getIpAddr() + "] MallUserInfoController::modifyStatus"); | ||||
| MallUserInfo currentUser = getUser(); | 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) { | private int checkUniqueName(String userName) { | ||||