ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit 4aa8b9a16b5ff19e73335e6ce225b35cbf50ee12 2 parents 0ad8026f 6966a124

Merge branch 'master' into test6.9.16

Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
@@ -136,7 +136,7 @@ public class ResourcesServiceImpl implements IResourcesService { @@ -136,7 +136,7 @@ public class ResourcesServiceImpl implements IResourcesService {
136 } 136 }
137 137
138 Stream<Resource> resourceStream = metadata.getResourcesContentDatas().stream().map(contentData -> Resource.builder() 138 Stream<Resource> resourceStream = metadata.getResourcesContentDatas().stream().map(contentData -> Resource.builder()
139 - .id(contentData.getPreContentId() == null ? contentData.getResourceContentId() : contentData.getPreContentId()) 139 + .id(contentData.getPreContentId() == null || contentData.getPreContentId() == 0 ? contentData.getResourceContentId() : contentData.getPreContentId())
140 .data(JSONObject.parseObject(contentData.getContentData())) 140 .data(JSONObject.parseObject(contentData.getContentData()))
141 .gender(gender) 141 .gender(gender)
142 .clientType(clientType) 142 .clientType(clientType)