修复用户管理->大司空相关账号无法删除用户问题

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

@@ -21,6 +21,7 @@ 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;
@@ -465,7 +466,6 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         SysRole adminRole = roleMapper.selectOne(new LambdaQueryWrapper<SysRole>()
                 .select(SysRole::getRoleId)
                 .eq(SysRole::getStatus, UserConstants.USER_NORMAL)
-                .eq(SysRole::getDelFlag, UserConstants.USER_NORMAL)
                 .eq(SysRole::getRoleKey, TenantConstants.TENANT_SUPER_ADMIN_ROLE_KEY));
         //如果目前企业管理员角色下仅有1个账号
         List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(adminRole.getRoleId());
@@ -650,8 +650,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         for (Long userId : userIds) {
             checkUserAllowed(new SysUser(userId));
             checkUserDataScope(userId);
+
             //校验企业管理员角色下是否至少有一个账号
-            checkAdminHasUsers(baseMapper.selectUserById(userId));
+            if (LoginHelper.isTenantAdmin()) {
+                checkAdminHasUsers(baseMapper.selectUserById(userId));
+            }
         }
 
         List<Long> ids = Arrays.asList(userIds);