diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java index 63507530..d8680e9e 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java @@ -195,17 +195,20 @@ public Resource resourceUpload(Resource resource) { String resourceUrl = tinyEngineUrl + "/" + imageEncodedName; String thumbnailUrl = tinyEngineUrl + "/" + thumbnailEncodedName; - if (!StringUtils.isEmpty(resourceData)) { - resource.setResourceUrl(resourceUrl); - resource.setThumbnailUrl(thumbnailUrl); - resource.setThumbnailData(ImageThumbnailGenerator.createThumbnail(resource.getResourceData(), 200, 200)); - } + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("hash", resource.getHash()); + queryWrapper.eq("app_id", resource.getAppId()); + queryWrapper.eq("tenant_id", loginUserContext.getTenantId()); // 接入租户系统需添加租户id查询 Resource resourceResult = this.baseMapper.selectOne(queryWrapper); if (resourceResult != null) { - throw new ServiceException(ExceptionEnum.CM003.getResultCode(), ExceptionEnum.CM003.getResultMsg()); + return resourceResult; + } + if (!StringUtils.isEmpty(resourceData)) { + resource.setResourceUrl(resourceUrl); + resource.setThumbnailUrl(thumbnailUrl); + resource.setThumbnailData(ImageThumbnailGenerator.createThumbnail(resource.getResourceData(), 200, 200)); } int createResult = this.baseMapper.createResource(resource); if (createResult != 1) {