From 220ea51534c34bd8dcb62ec36023be126cafe98f Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 6 May 2022 17:53:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2=E9=80=89?= =?UTF-8?q?=E6=8B=A9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/admin/service/impl/SystemAdminServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java index f137d249..43dcbf45 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java @@ -13,6 +13,7 @@ import com.hxkj.admin.service.ISystemRoleService; import com.hxkj.admin.validate.PageParam; import com.hxkj.admin.validate.system.SystemAdminParam; import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemRoleVo; import com.hxkj.admin.vo.system.SystemSelfVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; @@ -225,7 +226,9 @@ public class SystemAdminServiceImpl implements ISystemAdminService { .eq("nickname", systemAdminParam.getNickname()) .last("limit 1")), "昵称已存在换一个吧！"); - Assert.notNull(iSystemRoleService.detail(systemAdminParam.getRole()), "角色不存在!"); + SystemRoleVo roleVo = iSystemRoleService.detail(systemAdminParam.getRole()); + Assert.notNull(roleVo, "角色不存在!"); + Assert.isTrue(roleVo.getIsDisable() <= 0, "当前角色已被禁用!"); String salt = ToolsUtil.randomString(5); String pwd = ToolsUtil.makeMd5(systemAdminParam.getPassword().trim() + salt);