修复停用用户报错bug

dsk-system/src/main/java/com/dsk/system/service/impl/SysUserServiceImpl.java

@@ -21,7 +21,6 @@ import com.dsk.common.core.service.UserService;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.helper.DataBaseHelper;
 import com.dsk.common.helper.LoginHelper;
-import com.dsk.common.tenant.helper.TenantHelper;
 import com.dsk.common.utils.PasswordUtils;
 import com.dsk.common.utils.StreamUtils;
 import com.dsk.common.utils.StringUtils;
@@ -515,8 +514,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public int updateUserStatus(SysUser user) {
+        Set<String> rolePermission = Objects.requireNonNull(LoginHelper.getLoginUser()).getRolePermission();
         //如果禁用用户
-        if (UserConstants.USER_DISABLE.equals(user.getStatus())) {
+        if (UserConstants.USER_DISABLE.equals(user.getStatus())
+                && (rolePermission.contains(TenantConstants.TENANT_SUPER_ADMIN_ROLE_KEY)
+                || rolePermission.contains(TenantConstants.TENANT_ADMIN_ROLE_KEY))) {
             //校验企业管理员角色下是否至少有一个可用账号
             checkAdminHasUsers(baseMapper.selectUserById(user.getUserId()));
         }