|
...
|
...
|
@@ -136,7 +136,7 @@ public class ResourcesServiceImpl implements IResourcesService { |
|
|
|
}
|
|
|
|
|
|
|
|
Stream<Resource> resourceStream = metadata.getResourcesContentDatas().stream().map(contentData -> Resource.builder()
|
|
|
|
.id(contentData.getPreContentId() == null ? contentData.getResourceContentId() : contentData.getPreContentId())
|
|
|
|
.id(contentData.getPreContentId() == null || contentData.getPreContentId() == 0 ? contentData.getResourceContentId() : contentData.getPreContentId())
|
|
|
|
.data(JSONObject.parseObject(contentData.getContentData()))
|
|
|
|
.gender(gender)
|
|
|
|
.clientType(clientType)
|
...
|
...
|
|
