diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java index eee6676..bad1d18 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java @@ -66,7 +66,7 @@ public class ClientServiceImpl implements ClientService { map.put("name", e.getDesktopName()+"."+e.getDesktopType()); } if (StringUtils.isNotBlank(e.getFileSize())) { - map.put("file_size", e.getFileSize()); + map.put("file_size", StringUtils.isNotEmpty(e.getFileSize()) ? Long.parseLong(e.getFileSize()) : 0L); } if (StringUtils.isNotBlank(e.getStoragePath())) { map.put("storage_path", e.getStoragePath()); diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/ImageVirtualMachinesServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/ImageVirtualMachinesServiceImpl.java index 7e91e1c..a1033fc 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/ImageVirtualMachinesServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/ImageVirtualMachinesServiceImpl.java @@ -254,6 +254,12 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl desktopLambdaQueryWrapper=new LambdaQueryWrapper<>(); + desktopLambdaQueryWrapper.eq(ImageDesktop::getImageVirtualId, imageVirtualMachines.getId()); + int count = imageDesktopService.count(desktopLambdaQueryWrapper); + if (count>0){ + return Result.errorResult(BaseErrorCode.HTTP_ERROR_CODE_500, "该镜像有对应的克隆桌面,不允许删除"); + } // 调用镜像删除服务 ImageDeleteReq deleteReq = ImageDeleteReq.builder()